Merged version 94552 from main trunk into this branchalt_mapping_SAIC

1 files changed, 17 insertions, 11 deletions

diff --git a/examples/AMH/Sink_Server/client.cpp b/examples/AMH/Sink_Server/client.cpp
index 3b8f5af6824..c5d6a00e3f5 100644
--- a/examples/AMH/Sink_Server/client.cpp
+++ b/examples/AMH/Sink_Server/client.cpp
@@ -7,24 +7,30 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-  Client_Task task (argc, argv);
+      Client_Task task (argc, argv);
 
-  if (task.parse_args () != 1)
-    {
+      if (task.parse_args () != 1)
+        {
+          ACE_OS::exit (1);
+        }
 
-      ACE_OS::exit (1);
-    }
+      task.try_RT_scheduling ();
 
-  task.try_RT_scheduling ();
+      if (task.narrow_servant (orb.in()) != 1)
+        {
+          ACE_OS::exit (1);
+        }
 
-  if (task.narrow_servant (orb.in()) != 1)
+      task.run_test();
+    }
+  catch (const ::CORBA::Exception &ex)
     {
-        ACE_OS::exit (1);
+      ex._tao_print_exception ("ERROR : Unexpected CORBA exception caugth :");
     }
 
-  task.run_test();
-
   return 0;
 }