5 files changed, 65 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 6891dcd7cd1..bb111e54370 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -328,6 +328,18 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return client.check_results ();
+  int status = 0;
+
+  try
+    {
+      status = client.check_results ();
+    }
+  catch (const CORBA::Exception& se)
+    {
+      se._tao_print_exception ("Error: ");
+      status = 1;
+    }
+
+  return status;
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 5ec7883937c..779bde188e6 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -313,5 +313,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return events.check_results ();
+  int status = 0;
+
+  try
+    {
+      status = events.check_results ();
+    }
+  catch (const CORBA::Exception& se)
+    {
+      se._tao_print_exception ("Error: ");
+      status = 1;
+    }
+
+  return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 382a27887f1..1db133780ce 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -354,5 +354,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return client.check_results ();
+  int status = 0;
+
+  try
+    {
+      status = client.check_results ();
+    }
+  catch (const CORBA::Exception& se)
+    {
+      se._tao_print_exception ("Error: ");
+      status = 1;
+    }
+
+  return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 6b345e31871..9d4b0f3768b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -349,5 +349,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return events.check_results ();
+  int status = 0;
+
+  try
+    {
+      status = events.check_results ();
+    }
+  catch (const CORBA::Exception& se)
+    {
+      se._tao_print_exception ("Error: ");
+      status = 1;
+    }
+
+  return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 5cc9b2df6ec..c27af8a8979 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -231,5 +231,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return events.check_results ();
+  int status = 0;
+
+  try
+    {
+      status = events.check_results ();
+    }
+  catch (const CORBA::Exception& se)
+    {
+      se._tao_print_exception ("Error: ");
+      status = 1;
+    }
+
+  return status;
 }