ChangeLog tag: Wed May 24 03:01:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>

5 files changed, 21 insertions, 15 deletions

diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 621e3fb2e22..c068138c6b8 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -43,6 +43,9 @@ Client_Task::svc (void)
 
       server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      this->corb_->destroy();
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index 1133217c973..8fc9afedf0f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -3,7 +3,7 @@
 //
 #include "Server_Task.h"
 #include "test_i.h"
-
+#include "ace/OS_NS_time.h"
 #include "ace/Manual_Event.h"
 
 Server_Task::Server_Task (const char *output,
@@ -44,11 +44,11 @@ Server_Task::svc (void)
      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
-     Visual_i * server_impl;
+     PortableServer::ServantBase_var server_impl;
      ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
 
      PortableServer::ObjectId_var id =
-       root_poa->activate_object (server_impl
+       root_poa->activate_object (server_impl.in()
                                   ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
@@ -85,7 +85,9 @@ Server_Task::svc (void)
      sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
-     ACE_DEBUG ((LM_DEBUG, "server task - event loop finished\n"));
+     struct timespec ts = {0,250000000}; // quarter second
+     ACE_OS::nanosleep (&ts);
+     ACE_DEBUG ((LM_DEBUG, "(%P|%t) server task - event loop finished\n"));
 
      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index b89022f5ca2..58260168b5e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -299,6 +299,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
 
 Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 {
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) ~Echo_Server_Request_Interceptor\n"));
 }
 
 char *
@@ -325,7 +326,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.receive_request_service_contexts from "
+              "(%P|%t)%s.receive_request_service_contexts from "
               "\"%s\"\n",
               this->myname_,
               operation.in ()));
@@ -338,7 +339,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
-              "  Received service context: %s\n",
+              "(%P|%t)  Received service context: %s\n",
               buf));
 
   if (ACE_OS::strcmp (buf, request_msg) != 0)
@@ -388,7 +389,7 @@ Echo_Server_Request_Interceptor::send_reply (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.send_reply from \"%s\"\n",
+              "(%P|%t)%s.send_reply from \"%s\"\n",
               this->myname_,
               operation.in ()));
 
@@ -399,7 +400,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
-              "  Reply service context: %s\n",
+              "(%P|%t)  Reply service context: %s\n",
               buf));
 
   if (ACE_OS::strcmp (buf, reply_msg) != 0)
@@ -440,7 +441,7 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.send_exception from \"%s\"\n",
+              "(%P|%t)%s.send_exception from \"%s\"\n",
               this->myname_,
               operation.in ()));
 
@@ -451,7 +452,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
-              "  Reply service context: %s\n",
+              "(%P|%t)  Reply service context: %s\n",
               buf));
 
   if (ACE_OS::strcmp (buf, reply_msg) != 0)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl
index 73eb3128262..e9ed51b50c7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl
@@ -42,7 +42,7 @@ module Test_Interceptors
     void system ();
     // thows a system exception.
 
-   oneway void shutdown ();
+    oneway void shutdown ();
     // shutdown the ORB
   };
 };
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index c51e4c75a58..0b76048e39b 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -13,7 +13,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 }
 
 void
-Visual_i::normal (CORBA::Long 
+Visual_i::normal (CORBA::Long
                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -48,9 +48,9 @@ void
 Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
+  //  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+  //  ACE_CHECK;
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n"));
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }