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.

1 files changed, 27 insertions, 18 deletions

diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
index 0a0d128e0fd..7def21a9b10 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -193,31 +193,40 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (argc > 1 && ACE_OS::strcasecmp (argv[1],ACE_TEXT("-csv")) == 0)
     use_csv = true;
 
-  stringseq_time_test(100, false);
-  stringseq_time_test(1000, false);
+  try
+    {
+      stringseq_time_test(100, false);
+      stringseq_time_test(1000, false);
+
+      stringseq_time_test(100, true);
+      stringseq_time_test(1000, true);
 
-  stringseq_time_test(100, true);
-  stringseq_time_test(1000, true);
 
+      seqstrseq_time_test(100, 1, false);
+      seqstrseq_time_test(100, 10, false);
+      seqstrseq_time_test(1000, 10, false);
 
-  seqstrseq_time_test(100, 1, false);
-  seqstrseq_time_test(100, 10, false);
-  seqstrseq_time_test(1000, 10, false);
+      seqstrseq_time_test(100, 1, true);
+      seqstrseq_time_test(100, 10, true);
+      seqstrseq_time_test(1000, 10, true);
 
-  seqstrseq_time_test(100, 1, true);
-  seqstrseq_time_test(100, 10, true);
-  seqstrseq_time_test(1000, 10, true);
 
+      big_time_test(10, 1, 10, false);
+      big_time_test(10, 1, 10, false);
+      big_time_test(10, 10, 10, false);
+      big_time_test(100, 1, 10, false);
 
-  big_time_test(10, 1, 10, false);
-  big_time_test(10, 1, 10, false);
-  big_time_test(10, 10, 10, false);
-  big_time_test(100, 1, 10, false);
+      big_time_test(10, 1, 10, true);
+      big_time_test(10, 1, 10, true);
+      big_time_test(10, 10, 10, true);
+      big_time_test(100, 1, 10, true);
+    }
+  catch (CORBA::Exception &ex)
+    {
+      ex._tao_print_exception ("MAIN: Unexpected CORBA exception caught:");
+      return 1;
+    }
 
-  big_time_test(10, 1, 10, true);
-  big_time_test(10, 1, 10, true);
-  big_time_test(10, 10, 10, true);
-  big_time_test(100, 1, 10, true);
 
   return 0;
 }