diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-04-24 06:48:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-04-24 06:48:47 +0000 |
| commit | d5348f8834b3a1010d0c82e95a1ca293290177e7 (patch) | |
| tree | ee440da106d38a46076c0c501eedae398801e474 /CIAO/connectors/dds4ccm | |
| parent | 6c525dab6f8cf4a07276f6139430666037d1d736 (diff) | |
| download | ATCD-d5348f8834b3a1010d0c82e95a1ca293290177e7.tar.gz | |
Thu Apr 24 06:49:53 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ConditionManager.cpp:
Not being able to create a read condition should result in
a throw of an exception
* connectors/dds4ccm/impl/Getter_T.cpp:
Pass 0 as index as part of the exception thrown
Diffstat (limited to 'CIAO/connectors/dds4ccm')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ConditionManager.cpp | 6 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/Getter_T.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp index 55798364664..fcededd62ae 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp @@ -101,7 +101,7 @@ namespace CIAO DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO ACE_TEXT ("ConditionManager::init_readcondition - ") ACE_TEXT ("Error creating read condition.\n"))); - return; + throw ::CCM_DDS::InternalError (retcode, 0); } } @@ -114,7 +114,7 @@ namespace CIAO ACE_TEXT ("ConditionManager::init_readcondition - ") ACE_TEXT ("Unable to attach read condition to waitset. Error <%C>\n"), translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 0); } DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("ConditionManager::init_readcondition - ") @@ -225,7 +225,7 @@ namespace CIAO this->qc_getter_.in (), this->qc_listener_.in ())); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } else { diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index 5b19114abc0..d060d5d9bea 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -194,7 +194,7 @@ namespace CIAO "Error returning loan to DDS - <%C>\n", translate_retcode (retval))); } - throw ::CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 0); } ::DDS::ReturnCode_t const retval = @@ -206,7 +206,7 @@ namespace CIAO "Error returning loan to DDS - <%C>\n", translate_retcode (retval))); - throw ::CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 0); } return true; @@ -321,7 +321,7 @@ namespace CIAO translate_retcode (retval))); } - throw ::CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 0); } else if (data.length () == 1 && sample_info[0].valid_data) { @@ -352,7 +352,7 @@ namespace CIAO "Error returning loan to DDS - <%C>\n", translate_retcode (retval))); - throw ::CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 0); } } @@ -414,7 +414,7 @@ namespace CIAO "Error returning loan to DDS - <%C>\n", translate_retcode (retval))); } - throw ::CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 0); } else if (data.length () == 1 && sample_info[0].valid_data) { |