From f9fc1572fd22d755c9567916adc364298e081f4d Mon Sep 17 00:00:00 2001
From: msmit <msmit@remedy.nl>
Date: Fri, 26 Aug 2011 11:09:22 +0000
Subject: Fri Aug 26 11:09:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>

        * DevGuideExamples/ValueTypes/Bank/client.cpp:
        * examples/AMH/Sink_Server/client.cpp:
        * examples/Event_Comm/supplier.cpp:
        * examples/Simple/bank/server.cpp:
        * examples/Simple/echo/server.cpp:
        * examples/Simple/grid/server.cpp:
        * examples/Simple/time/server.cpp:
        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp:
        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp:
        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp:
        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp:
        * performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp:
        * tests/Bug_1383_Regression/SimpleClient.cpp:
        * tests/Bug_3506_Regression/client.cpp:
        * tests/Bug_3548_Regression/client.cpp:
        * tests/CDR/allocator.cpp:
        * tests/Connection_Failure/client.cpp:
        * tests/DII_AMI_Forward/client.cpp:
        * tests/DynAny_Test/driver.cpp:
        * tests/OBV/ValueBox/client.cpp:
        * tests/POA/EndpointPolicy/server.cpp:
        * tests/POA/Loader/server.cpp:
        * tests/Param_Test/driver.cpp:
        * tests/Portable_Interceptors/AdvSlot/client.cpp:
        * tests/Portable_Interceptors/AdvSlot/server.cpp:
        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
        * tests/Portable_Interceptors/AdvSlotExt/client.cpp:
        * tests/RTScheduling/Scheduling_Interceptor/test_client.cpp:
        * tests/RTScheduling/VoidData/test_client.cpp:
        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
        * tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp:
        * tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp:
        * tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp:
        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
        * utils/nslist/nsadd.cpp:
        * utils/nslist/nsdel.cpp:
        * utils/nslist/nslist.cpp:
          Fixed issues regarding exceptions which are not caught.
---
 .../Portable_Interceptors/AdvSlotExt/client.cpp    | 30 ++++++++++++++--------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'TAO/tests/Portable_Interceptors/AdvSlotExt')

diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
index 9dde6c00f21..e3878d4c9ed 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
@@ -6,22 +6,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);
 
-  if (argc != 2)
-  {
-    ACE_DEBUG ((LM_ERROR, "Usage: %s <ior>\n", argv[0]));
-    return -1;
-  }
+      if (argc != 2)
+        {
+          ACE_DEBUG ((LM_ERROR, "Usage: %s <ior>\n", argv[0]));
+          return -1;
+        }
 
-  CORBA::Object_var obj = orb->string_to_object (argv[1]);
-  StateTransfer_var server = StateTransfer::_narrow (obj.in ());
+      CORBA::Object_var obj = orb->string_to_object (argv[1]);
+      StateTransfer_var server = StateTransfer::_narrow (obj.in ());
 
-  CORBA::Short n  = server->number ();
+      CORBA::Short n  = server->number ();
 
-  ACE_DEBUG ((LM_ERROR, "Got number %d\n", n));
+      ACE_DEBUG ((LM_ERROR, "Got number %d\n", n));
 
-  server->shutdown ();
+      server->shutdown ();
 
+    }
+  catch (const ::CORBA::Exception &ex)
+    {
+      ex._tao_print_exception ("ERROR : unexpected CORBA exception caught : ");
+      return 1;
+    }
   return 0;
 }
-- 
cgit v1.2.1