ChangeLogTag:Sun Mar 2 10:04:54 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 85 insertions, 67 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f5a58672fa6..ea4679046fd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Sun Mar  2 10:04:54 2003  Ossama Othman  <ossama@uci.edu>
+
+	* tao/DynamicAny/DynStruct_i.cpp (current_member_kind):
+	  (get_members_as_dyn_any):
+
+	  Fixed emulated exception macro usage.  "ACE_CHECK_RETURN", not
+	  "ACE_CHECK".
+
+	* tests/DynAny_Test/test_dynstruct.cpp (run_test):
+	* tests/DynAny_Test/test_dynunion.cpp (run_test):
+
+	  Fixed emulated exception macro usage.  "ACE_TRY_{CHECK_}EX", not
+	  "ACE_TRY{_CHECK}".
+
+	  Added missing "ACE_TRY_CHECK" after inner ACE_TRY block's
+	  ACE_ENDTRY.
+
 Sun Mar  2 09:23:18 2003  Ossama Othman  <ossama@uci.edu>
 
 	* tests/DynAny_Test/test_dynstruct.cpp (run_test):
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index bca822faeeb..ee80287ff0f 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -234,7 +234,7 @@ TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (0);
   const char *name =
     unaliased_tc->member_name (this->current_position_
                                ACE_ENV_ARG_PARAMETER);
@@ -275,7 +275,7 @@ TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (0);
   CORBA::TypeCode_var tc =
   unaliased_tc->member_type (this->current_position_
                                   ACE_ENV_ARG_PARAMETER);
@@ -416,7 +416,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (0);
 
   // Assign name and value to each pearl on the string.
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index fef41e97514..f10ea7f763c 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 // $Id$
 // ============================================================================
 //
@@ -207,44 +206,46 @@ Test_DynStruct::run_test (void)
       CORBA::Any_var out_any2 ;
       DynamicAny::DynStruct_var ftc2;
 
-      ACE_TRY
-      {
-         DynamicAny::DynAny_var ftc2_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct_alias
-                                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (CORBA::is_nil (ftc2.in ()))
+      ACE_TRY_EX (bad_kind)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "DynStruct::_narrow() returned nil\n"),
-                            -1);
+          DynamicAny::DynAny_var ftc2_base =
+            dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct_alias
+                                                           ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+
+          ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ()
+                                                 ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+
+          if (CORBA::is_nil (ftc2.in ()))
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "DynStruct::_narrow() returned nil\n"),
+                                -1);
+            }
+
+          ts.c = data.m_char1;
+          ts.l = data.m_long1;
+          ts.es.f = data.m_float1;
+          ts.es.s = data.m_short1;
+          CORBA::Any in_any3;
+          in_any3 <<= ts;
+          ftc2->from_any (in_any3
+                          ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+          out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+          if ((out_any2.in () >>= ts_out2) != 1) // problem
+            {
+              ts_out2 = 0;
+            }
         }
-
-        ts.c = data.m_char1;
-        ts.l = data.m_long1;
-        ts.es.f = data.m_float1;
-        ts.es.s = data.m_short1;
-        CORBA::Any in_any3;
-        in_any3 <<= ts;
-        ftc2->from_any (in_any3
-                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        if ((out_any2.in () >>= ts_out2) != 1) // problem
+      ACE_CATCH (CORBA::TypeCode::BadKind, ex)
         {
-           ts_out2 = 0;
         }
-     }
-     ACE_CATCH (CORBA::TypeCode::BadKind, ex)
-     {
-     }
-     ACE_ENDTRY;
-
+      ACE_ENDTRY;
+      ACE_TRY_CHECK;
+      
       if (ts_out2 != 0 && ts_out2->es.s == data.m_short1)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index a0f8d9b528e..7011ec128a8 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 // $Id$
 // ============================================================================
 //
@@ -153,38 +152,39 @@ Test_DynUnion::run_test (void)
 
       CORBA::TypeCode_var s_out3;
 
-      ACE_TRY
-      {
-        DynamicAny::DynAny_var ftc2_base = dynany_factory->create_dyn_any_from_type_code
-          (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        DynamicAny::DynUnion_var ftc2 =
-        DynamicAny::DynUnion::_narrow (ftc2_base.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (CORBA::is_nil (ftc2.in ()))
+      ACE_TRY_EX (bad_kind)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "DynUnion::_narrow() returned nil\n"),
-                            -1);
+          DynamicAny::DynAny_var ftc2_base =
+            dynany_factory->create_dyn_any_from_type_code
+            (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+          DynamicAny::DynUnion_var ftc2 =
+            DynamicAny::DynUnion::_narrow (ftc2_base.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+
+          if (CORBA::is_nil (ftc2.in ()))
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "DynUnion::_narrow() returned nil\n"),
+                                -1);
+            }
+
+          ftc2->from_any (out_any2.in ()
+                          ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+          ftc2->seek (1
+                      ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
+          s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (bad_kind);
         }
-
-        ftc2->from_any (out_any2.in ()
-                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        ftc2->seek (1
-                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-      }
       ACE_CATCH (CORBA::TypeCode::BadKind, ex)
-      {
-        // Failed to create
-      }
+        {
+          // Failed to create
+        }
       ACE_ENDTRY;
+      ACE_TRY_CHECK;
 
       if ( ! CORBA::is_nil (s_out3.in ()) &&
            s_out3.in ()->equal (data.m_typecode1))