1 files changed, 18 insertions, 33 deletions
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e149b323d49..01e0b962d78 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -6,12 +6,11 @@
 ACE_RCSID(Muxing, client, "$Id$")
 
 const char *ior = "file://test.ior";
-bool shutdown_srv = false;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Opt get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -20,15 +19,11 @@ parse_args (int argc, char *argv[])
       case 'k':
         ior = get_opts.opt_arg ();
         break;
-      case 'x':
-        shutdown_srv = true;
-        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-                           "-k <ior> "
-                           "[-x]"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -65,34 +60,24 @@ main (int argc, char *argv[])
                             1);
         }
 
-      if (shutdown_srv)
-        {
-          receiver->shutdown ();
-        }
-      else
+
+      Client_Task client_task (receiver.in (),
+                               1000,
+                               32768,
+                               ACE_Thread_Manager::instance ());
+
+      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
         {
-        
-          Client_Task client_task (receiver.in (),
-#if defined (ACE_OPENVMS)
-                                  750, /* test takes much longer on OpenVMS */
-#else
-                                  1000,
-#endif
-                                  32768,
-                                  ACE_Thread_Manager::instance ());
-        
-          if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
-              {
-              ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-              }
-          ACE_Thread_Manager::instance ()->wait ();
-        
-          CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        
-          ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
-                      count));
+          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
         }
+      ACE_Thread_Manager::instance ()->wait ();
+
+      CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
+                  count));
+
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }