diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-24 15:15:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-24 15:15:47 +0000 |
| commit | d5e2d08751d52b089dbe9004fd77e55f0fecd499 (patch) | |
| tree | d90070eaf971539f0b0f221ed1d604f2cf30c7ff | |
| parent | bb0483e697bca5df0931dc6cafbd4e70f8879318 (diff) | |
| download | ATCD-d5e2d08751d52b089dbe9004fd77e55f0fecd499.tar.gz | |
Tue Nov 24 15:15:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp:
Added support for the environment variable DDS4CCM_DEFAULT_DOMAIN_ID
This influences the default domain id which is set by the connector.
All test deployment plans don't set a domain id, which cause problems
during testing because everyone is in the same domain. Each developer
and build system on the same network should have its own unique id
to get an isolated test environment.
| -rw-r--r-- | CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b5356c6315e..aab4fa074f1 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Tue Nov 24 15:15:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + Added support for the environment variable DDS4CCM_DEFAULT_DOMAIN_ID + This influences the default domain id which is set by the connector. + All test deployment plans don't set a domain id, which cause problems + during testing because everyone is in the same domain. Each developer + and build system on the same network should have its own unique id + to get an isolated test environment. + Tue Nov 24 13:25:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp index 1a0237dc67d..b2a04dc2738 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp @@ -5,12 +5,15 @@ #include "dds4ccm/impl/ndds/DomainParticipantFactory.h" #include "dds4ccm/impl/ndds/DomainParticipant.h" #include "ace/Tokenizer_T.h" +#include "ace/Env_Value_T.h" template <typename DDS_TYPE, typename CCM_TYPE> DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::DDS_Base_Connector_T (void) : domain_id_ (0) - , configuration_complete_ (false) + , configuration_complete_ (false) { + ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), this->domain_id_); + this->domain_id_ = id; } template <typename DDS_TYPE, typename CCM_TYPE> |