ChangeLogTag: Mon Jul 23 12:35:00 UTC 2007 Simon Massey <sma@prismtech.com>

6 files changed, 19 insertions, 3 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a076f42971a..47206284555 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jul 23 12:35:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * tests\OctetSeq\client.cpp:
+        * tests\OctetSeq\server.cpp:
+        * performance-tests\Protocols\distributor.cpp:
+        * performance-tests\Protocols\receiver.cpp:
+        * performance-tests\Protocols\sender.cpp:
+
+          Add small delay to shutdown between run loop and destroy orb.
+
 Mon Jul 23 12:21:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Muxed_TMS.{h,cpp}
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 5cf20b087b5..4f1f70d8ab8 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -377,6 +377,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       orb->run ();
+      ACE_OS::sleep(1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 608bf5272f0..bb59104867d 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/Sample_History.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
@@ -378,6 +379,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       orb->run ();
+      ACE_OS::sleep(1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index d22d1a1e0d6..56f39c5687b 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -731,6 +731,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           test->shutdown ();
         }
+      ACE_OS::sleep(1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index 547f5d87292..290e300ab19 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -5,6 +5,7 @@
 #include "testC.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(OctetSeq, client, "$Id$")
 
@@ -159,7 +160,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       server->shutdown ();
-
+      ACE_OS::sleep(1);
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index f2ace5675e7..860cc46a661 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (OctetSeq,
            server,
@@ -95,10 +96,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         orb->run ();
 
         ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
+        ACE_OS::sleep(1);
         root_poa->destroy (1, 1);
       }
-
+      ACE_OS::sleep(1);
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)