4 files changed, 13 insertions, 5 deletions
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index 2a979dede09..d44ffbd86e6 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -55,8 +55,8 @@ Client_Task::validate_connection (void)
   ACE_DECLARE_NEW_CORBA_ENV;
 
   // Try to setup a connection to the remote server, ignoring all the
-  // exceptions  that are expected (see bug 189 on why it is so). We
-  // could use a a validate_connection for it . But we wantthis test
+  // exceptions that are expected (see bug 189 on why it is so). We
+  // could use a a validate_connection for it . But we want this test
   // to work with Minimum CORBA builds too..
   for (int i = 0; i != 100; ++i)
     {
@@ -66,7 +66,7 @@ Client_Task::validate_connection (void)
           this->reply_gen_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-        ACE_CATCHANY {}
-        ACE_ENDTRY;
+      ACE_CATCHANY {}
+      ACE_ENDTRY;
     }
 }
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 803b5db7e89..05651121792 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -73,6 +73,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n"));
 
+      // Request the server to shutdown
+      reply_gen->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Big_Reply/run_test.pl b/TAO/tests/Big_Reply/run_test.pl
index 95de1e9ab13..4c2bf3c3b30 100755
--- a/TAO/tests/Big_Reply/run_test.pl
+++ b/TAO/tests/Big_Reply/run_test.pl
@@ -32,7 +32,7 @@ if ($client1 != 0) {
 }
 
 
-$server = $SV->TerminateWaitKill (5);
+$server = $SV->WaitKill (10);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index fbaa60dad4b..b09fbd74a0b 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -41,6 +41,8 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  ACE_DEBUG ((LM_DEBUG, "Starting server\n"));
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -114,5 +116,7 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
 
+  ACE_DEBUG ((LM_DEBUG, "Ending server\n"));
+
   return 0;
 }