summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f735e440dd5..6a2766af046 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 25 08:10:00 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+ * tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp:
+ Solved error in destroying the orb.
+
Fri Oct 21 14:44:28 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/IORManipulation/IORManipulation.mpc:
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index 5064d87f5a7..4fba2c2949b 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -71,8 +71,8 @@ Client_Task::svc (void)
"thru_poa collocation received\n"));
status = 1;
}
+ corb_->destroy ();
}
- corb_->destroy ();
}
catch (const CORBA::Exception& ex)
{