2 files changed, 6 insertions, 2 deletions

diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index e538b520a3f..8024ef6f70b 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -243,6 +243,10 @@ main (int argc, char* argv[])
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
+          if (consumer.event_count () == 25)
+          {
+            break;
+          }
         }
 
       // **************** THAT COMPLETES THE EVENT LOOP
@@ -302,7 +306,7 @@ main (int argc, char* argv[])
       // **************** THAT COMPLETES THE CLEANUP CODE
 
       ACE_DEBUG ((LM_DEBUG,
-                  "MCast example terminated\n"));
+                  "UDP receiver ready\n"));
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index e0f5fa6e977..07d00c02a6a 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -267,7 +267,7 @@ main (int argc, char* argv[])
       // **************** THAT COMPLETES THE CLEANUP CODE
 
       ACE_DEBUG ((LM_DEBUG,
-                  "MCast example ready\n"));
+                  "UDP sender ready\n"));
     }
   ACE_CATCHANY
     {