summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tests/DSI_Gateway/client.cpp19
2 files changed, 22 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3b27b81a3d4..8db86ffebab 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 3 01:18:45 UTC 2008 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * tests/DSI_Gateway/client.cpp:
+
+ Reworded exception handlers to avoid having the nightly build
+ scoreboard detect expected exceptions as errors. This is the
+ same error that was documented in bug 2879.
+
Wed Apr 2 12:13:50 UTC 2008 Phil Mesnier <mesnier_p@ociweb.com>
* tests/DSI_AMI_Gateway/client.cpp:
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 4aa2aebab3f..ac36e877aef 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -161,7 +161,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
catch (const test_exception& ex)
{
- ex._tao_print_exception ("Client: exception caught - ");
+ if (test_user_exception == 1)
+ ACE_DEBUG ((LM_DEBUG,
+ "Client: caught expected user exception: %s\n",
+ ex._name()));
+ else
+ ex._tao_print_exception ("Client: exception caught - ");
ACE_DEBUG ((LM_DEBUG,
"error code: %d\n"
@@ -171,13 +176,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ex.error_message.in (),
ex.status_message.in ()));
- return 0;
+ return test_user_exception == 1 ? 0 : 1;
}
catch (const CORBA::NO_PERMISSION& ex)
{
- ex._tao_print_exception ("Client: exception caught - ");
-
- return 0;
+ if (test_system_exception == 1)
+ ACE_DEBUG ((LM_DEBUG,
+ "Client: caught expected system exception: %s\n",
+ ex._name()));
+ else
+ ex._tao_print_exception ("Client: exception caught - ");
+ return test_system_exception == 1 ? 0 : 1;
}
catch (const CORBA::Exception& ex)
{