diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-19 18:16:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-19 18:16:34 +0000 |
| commit | 45a858d6e98953a6bc4b41813662816bb764aeb6 (patch) | |
| tree | 53e58dfcafdf03baf5fedae19b46158acba221af | |
| parent | d0ab8424fee335717931591b174df873026800cf (diff) | |
| download | ATCD-45a858d6e98953a6bc4b41813662816bb764aeb6.tar.gz | |
Mon Nov 19 18:15:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/DataReaderListener_T.cpp:
Layout changes
* connectors/dds4ccm/impl/DomainParticipantManager.cpp:
Check for (un)registration of nil domain participants, log
profile during unregistration
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp | 16 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp | 20 |
3 files changed, 33 insertions, 12 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 9e07257d3c5..d82a580792e 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Nov 19 18:15:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/DataReaderListener_T.cpp: + Layout changes + + * connectors/dds4ccm/impl/DomainParticipantManager.cpp: + Check for (un)registration of nil domain participants, log + profile during unregistration + Mon Nov 12 10:07:05 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp index a89e62d4db6..24b30dfb4a3 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp @@ -113,18 +113,18 @@ namespace CIAO { ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc.in ()); result = reader->take_w_condition (data, - sample_info, - max_samples, - rd.in ()); + sample_info, + max_samples, + rd.in ()); } else { result = reader->take (data, - sample_info, - max_samples, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ANY_INSTANCE_STATE); + sample_info, + max_samples, + ::DDS::NOT_READ_SAMPLE_STATE, + ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, + ::DDS::ANY_INSTANCE_STATE); } DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp index e72d4b175ff..0fbf6d646da 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp @@ -151,6 +151,11 @@ namespace CIAO ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, this->dps_mutex_, CORBA::INTERNAL ()); + if (::CORBA::is_nil (dp)) + { + return false; + } + std::string profile; if (qos_profile) { @@ -180,7 +185,7 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DomainParticipantManager::register_participant - " "Added a new DomainParticipant " - "for domain <%d> with profile<%C> handle " + "for domain <%d> with profile <%C> handle " DDS_ENTITY_FORMAT_SPECIFIER ".\n", domain_id, qos_profile, DDS_ENTITY_LOG (dp))); @@ -209,6 +214,11 @@ namespace CIAO ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, this->dps_mutex_, CORBA::INTERNAL ()); + if (::CORBA::is_nil (dp)) + { + return false; + } + std::string profile; if (qos_profile) { @@ -225,9 +235,10 @@ namespace CIAO "DomainParticipantManager::unregister_participant - " "Delete participant " DDS_ENTITY_FORMAT_SPECIFIER - " for domain <%d> since ref_count is one.\n", + " for domain <%d> with profile <%C> since ref_count is one.\n", DDS_ENTITY_LOG (dp), - domain_id)); + domain_id, + qos_profile)); delete iter->second; // Save to remove from list @@ -239,10 +250,11 @@ namespace CIAO "DomainParticipantManager::unregister_participant - " "Don't delete participant " DDS_ENTITY_FORMAT_SPECIFIER - " for domain <%d> since " + " for domain <%d> with profile <%C> since " "it's still used - ref_count is <%d>\n", DDS_ENTITY_LOG (dp), domain_id, + qos_profile, iter->second->_ref_count ())); iter->second->_dec_ref (); return false; |