diff options
16 files changed, 103 insertions, 180 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 17245c8457c..f196757c4bf 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,22 @@ +Mon Nov 29 11:09:39 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: + * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: + * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: + * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: + * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: + * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: + * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: + * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: + * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: + * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: + * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: + * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: + * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: + * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: + * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: + Delete pointers without checking not o. + Mon Nov 29 10:51:56 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/ConditionManager.cpp: diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp index 0c7bef6151e..c13fb5ce3dc 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp @@ -230,16 +230,10 @@ namespace CIAO_AsynchT_Sender_Impl ACE_DEBUG ((LM_DEBUG, "OK: Test asynchronous, received back %u.\n", this->nr_of_rec_.value())); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" ASYNCHT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp index 776e826b4c5..a58ec13a190 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp @@ -190,16 +190,10 @@ namespace CIAO_DelReplyH_Sender_Impl ACE_DEBUG ((LM_DEBUG, "OK: All constructed ReplyHandlers were deleted.\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp index b9c0d947fe1..99c62321219 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp @@ -262,16 +262,10 @@ namespace CIAO_ExceptionT_Sender_Impl " exceptions for asynchronous and " "synchronous calls\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp index 8e63f8385c8..97681650075 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp @@ -252,16 +252,10 @@ namespace CIAO_InterInArgsT_Sender_Impl " callbacks and exceptions for syn- and " "asynchronous calls\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" INTERINARGS_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp index 573ff741bba..ad67b132720 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp @@ -248,29 +248,24 @@ namespace CIAO_InterInOutT_Sender_Impl "Expected: 2, Received: %u.\n", nr_of_excep_received)); } - if (this->nr_of_received_.value() != 6) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender not received the expected number" - " of callbacks and returns for syn- and " - "asynchronous calls. Expected: 6," - " Received: %u.\n", - this->nr_of_received_.value())); - } - if ((this->nr_of_received_.value() == 6) && (nr_of_excep_received == 2)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" - " callbacks and exceptions for syn- and " - "asynchronous calls\n")); - } if (this->asynch_foo_gen) + if (this->nr_of_received_.value() != 6) { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; + ACE_ERROR ((LM_ERROR, "ERROR: Sender not received the expected number" + " of callbacks and returns for syn- and " + "asynchronous calls. Expected: 6," + " Received: %u.\n", + this->nr_of_received_.value())); } - if (this->synch_foo_gen) + if ((this->nr_of_received_.value() == 6) && (nr_of_excep_received == 2)) { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; + ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" + " callbacks and exceptions for syn- and " + "asynchronous calls\n")); } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" INTERINOUT_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp index 5a2d1230493..7a54e550ae4 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp @@ -255,42 +255,27 @@ namespace CIAO_InterMulti_Sender_Impl Sender_exec_i::ccm_remove (void) { if (this->nr_of_received_.value() != 5) - { - ACE_ERROR ((LM_ERROR, "ERROR: Did not get all callbacks for" + { + ACE_ERROR ((LM_ERROR, "ERROR: Did not get all callbacks for" "derived classes." " Received = %u of 5\n", this->nr_of_received_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "OK: All messages received back by Sender\n")); - } - if (this->asynch_one_gen) - { - delete this->asynch_one_gen; - this->asynch_one_gen = 0; } - if (this->synch_one_gen) + else { - delete this->synch_one_gen; - this->synch_one_gen = 0; - } - if (this->asynch_two_gen) - { - delete this->asynch_two_gen; - this->asynch_two_gen = 0; - } - if (this->asynch_three_gen) - { - delete this->asynch_three_gen; - this->asynch_three_gen = 0; - } - if (this->synch_three_gen) - { - delete this->synch_three_gen; - this->synch_three_gen = 0; + ACE_DEBUG ((LM_DEBUG, + "OK: All messages received back by Sender\n")); } + delete this->asynch_one_gen; + this->asynch_one_gen = 0; + delete this->synch_one_gen; + this->synch_one_gen = 0; + delete this->asynch_two_gen; + this->asynch_two_gen = 0; + delete this->asynch_three_gen; + this->asynch_three_gen = 0; + delete this->synch_three_gen; + this->synch_three_gen = 0; } extern "C" INTERMULTI_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp index d7c72bdd5f8..373e442381f 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp @@ -199,16 +199,10 @@ namespace CIAO_InterOutArgsT_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR: Sender didn't receive all expected data" " for syn- and asynchronous calls\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" INTEROUTARGS_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp index 38fcafaaf5f..3c1bce31388 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp @@ -210,16 +210,10 @@ namespace CIAO_InterReturnT_Sender_Impl " return data for syn- and asynchronous" " calls\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" INTERRETURN_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp index a33d44978a8..d098c32d82f 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp @@ -205,16 +205,10 @@ namespace CIAO_NoReplyH_Sender_Impl "callbacks: %u.\n", this->nr_received_back_.value())); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" NOREPLYH_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp index 695c5ea50e5..9d7af880af0 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp @@ -241,16 +241,11 @@ namespace CIAO_OneProcess_Sender_Impl ACE_DEBUG ((LM_DEBUG, "OK: All in one proces worked synchronous as expected\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - }} + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; + } extern "C" ONEPROCESS_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr create_OneProcess_Sender_Impl (void) diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp index aca201afe5b..a60a5dec168 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp @@ -247,16 +247,10 @@ namespace CIAO_OneReplyH_Sender_Impl " callbacks and exceptions for syn- and " "asynchronous calls\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" ONEREPLYH_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp index 730b4f67002..4e6a69e2183 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp @@ -244,16 +244,10 @@ namespace CIAO_UsesSM_Sender_Impl ACE_DEBUG ((LM_DEBUG, "OK: All messages received back by Sender\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" USESSM_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp index 22e98e5da34..1ee10ce32b3 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp @@ -198,16 +198,10 @@ namespace CIAO_ThreeComp_Master_Impl { ACE_DEBUG ((LM_DEBUG, "OK: Test Master.\n")); } - if (this->asynch_state_gen) - { - delete this->asynch_state_gen; - this->asynch_state_gen = 0; - } - if (this->synch_state_gen) - { - delete this->synch_state_gen; - this->synch_state_gen = 0; - } + delete this->asynch_state_gen; + this->asynch_state_gen = 0; + delete this->synch_state_gen; + this->synch_state_gen = 0; } extern "C" THREECOMP_MASTER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp index 05286cfc4c2..54f270d9b56 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp @@ -290,17 +290,12 @@ namespace CIAO_ThreeComp_Sender_Impl else { ACE_DEBUG ((LM_DEBUG, "OK: Sender works as expected.\n")); - } if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - } + } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; + } extern "C" THREECOMP_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr create_ThreeComp_Sender_Impl (void) diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp index 290817766df..ca085c656c7 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp @@ -226,16 +226,10 @@ namespace CIAO_UsesMulti_Sender_Impl ACE_DEBUG ((LM_DEBUG, "OK: All messages received back by Sender\n")); } - if (this->asynch_foo_gen) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - } - if (this->synch_foo_gen) - { - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } + delete this->asynch_foo_gen; + this->asynch_foo_gen = 0; + delete this->synch_foo_gen; + this->synch_foo_gen = 0; } extern "C" USESMULTI_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr |