1 files changed, 11 insertions, 5 deletions
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 33928847556..8a9c4f89ea9 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -112,13 +112,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           break;
       }
 
-      ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages...\n"));
+      int count = payload_receiver_impl->count();
 
-      ACE_Time_Value tv(3);
-      orb->run(tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      if (count != expected)
+        {
+          ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages, "
+                               "have now %d messages already...\n", count));
 
-      int count = payload_receiver_impl->count();
+          ACE_Time_Value tv(5);
+          orb->run(tv ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          count = payload_receiver_impl->count();
+        }
 
       int result = 0;