summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-08-27 13:30:02 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-08-27 13:30:02 +0000
commit26eee8a207b59801ff5be138bd69a0f3481b4f1b (patch)
treead7cbd27b78caf1d4734043c1170a6d25ea5f49a
parent09d874890a44acd248fcbceed72f0998ce44c616 (diff)
downloadATCD-26eee8a207b59801ff5be138bd69a0f3481b4f1b.tar.gz
Mon Aug 27 13:29:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/Bug_2356_Regression/client.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d1356f1ad82..34ec2ce907b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 27 13:29:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Bug_2356_Regression/client.cpp:
+ Fixed error in this test program, when things did work we returned
+ 1 by accident which was wrong
+
Mon Aug 27 08:06:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/SSLIOP.mpc:
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index fb5d7cae627..25d140fe0d3 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -101,8 +101,8 @@ public:
ex._tao_print_exception ("ERROR");
ACE_ERROR ((LM_ERROR,
"... caught the exception but got wrong wstring -> ERROR\n"));
+ result = 1;
}
- result = 1;
}
catch (const CORBA::Exception& ex)
{