1 files changed, 37 insertions, 11 deletions

diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 2e2ec401a29..9687e3ec488 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -33,6 +33,8 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
+void get_stringList2(Test::Hello_var hello);
+
 int
 main (int argc, char *argv[])
 {
@@ -63,7 +65,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList\n"));
 
-	  Test::StringList_var seq =
+      Test::StringList_var seq =
         hello->get_stringList (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -71,7 +73,7 @@ main (int argc, char *argv[])
         CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]);
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
-	  }
+      }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList2 with initialization\n"));
 
@@ -83,18 +85,11 @@ main (int argc, char *argv[])
         CORBA::String_var the_string = seq2.in()[i];
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
-	  }
+      }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList2 without initialization\n"));
 
-      hello->get_stringList2(false, seq2.out());
-      ACE_TRY_CHECK;
-
-      for (CORBA::ULong i = 0; i<seq2->length(); i++) {
-        CORBA::String_var the_string = seq2.in()[i];
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
-                  the_string.in ()));
-	  }
+      get_stringList2(hello);
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - mod_stringList\n"));
 
@@ -123,3 +118,34 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+void get_stringList2(Test::Hello_var hello)
+{
+    Test::StringList_var seq2;
+
+  ACE_TRY_NEW_ENV
+    {
+      // Shutdown the ORB and block until the shutdown is complete.
+      hello->get_stringList2(false, seq2.out());
+      ACE_TRY_CHECK;
+
+      for (CORBA::ULong i = 0; i<seq2->length(); i++) {
+        CORBA::String_var the_string = seq2.in()[i];
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+                  the_string.in ()));
+	  }
+    }
+  ACE_CATCH(CORBA::BAD_PARAM, ex)
+    {
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n"));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "get_stringList2");
+    }
+  ACE_ENDTRY;
+
+
+    return;
+}