ChangeLogTag: Fri Apr 26 10:07:45 2002 Balachandran Natarajan <bala@cs.wustl.edu>

4 files changed, 15 insertions, 29 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 02efd2855f6..871cf2ac71e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Fri Apr 26 10:07:45 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tests/RTCORBA/Client_Protocol/server.cpp:
+	* tests/RTCORBA/Client_Protocol/test.idl:
+	* tests/RTCORBA/Client_Protocol/client.cpp (main): Instead of
+	  making a remote call make teh client to sleep for 5
+	  seconds. This would make the server go away completely and stop
+	  the race seen in [Bug 1197]. This change seems better than the
+	  previous change made to this test.
+
 Thu Apr 25 21:45:46 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Transport_Connector.cpp: Fixed a typo in a debug statement
@@ -27,7 +37,6 @@ Thu Apr 25 16:36:41 2002  Ossama Othman  <ossama@uci.edu>
 	  TAO_PI_Current object to zero.  Obviously, it should no longer
 	  be used after this point.
 
->>>>>>> 1.5442
 Thu Apr 25 16:42:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp:
@@ -69,7 +78,6 @@ Thu Apr 25 16:42:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
           for pointing out the lack of these spec-required methods. 
 
 Thu Apr 25 16:37:28 2002 Balachandran Natarajan  <bala@cs.wustl.edu>
->>>>>>> 1.5440
 
 	* tests/RTCORBA/Server_Protocol/run_test.pl: For a change the hack
 	  in this test to get around bug 1197 is to disable SHMIOP at
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index a26190ac981..ba874cb4f0e 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -251,17 +251,10 @@ main (int argc, char *argv[])
                   "\n     Testing over\n"));
       server2->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      ACE_TRY_EX (SHM)
-	{
-	  server2->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_TRY_CHECK_EX (SHM);
-	}
-      ACE_CATCHANY
-	{
-	  // No op
-	}
-      ACE_ENDTRY;
+
+      // Needed for SHMIOP to work fine. Please dont remove. Please
+      // see Bug 1197  for details.
+      ACE_OS::sleep (5);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index cc000efbdb2..be63dbe15e2 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -21,9 +21,6 @@ public:
 
   void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void ping (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   CORBA::ORB_var orb_;
@@ -52,13 +49,6 @@ Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
-void
-Test_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // no-op
-}
-
 //*************************************************************************
 
 const char *ior_output_file1 = "test1.ior";
@@ -263,4 +253,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/Client_Protocol/test.idl b/TAO/tests/RTCORBA/Client_Protocol/test.idl
index 6db6492439c..4a73b5f42e6 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/test.idl
+++ b/TAO/tests/RTCORBA/Client_Protocol/test.idl
@@ -9,9 +9,5 @@ interface Test
 
   oneway void shutdown ();
   // Shut down the ORB.
-  
-  /* For SHMIOP. Please see Bug 1197 for details. This test seems to 
-   * use SHMIOP
-   */
-  void ping ();
+
 };