Fri Apr 7 19:54:44 UTC 2006 Wallace Zhang <zhangw@ociweb.com>

4 files changed, 10 insertions, 58 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b5b50757409..9d54698a38e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Apr  7 19:54:44 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * tao/Connection_Handler.cpp:
+        * tao/Resume_Handle.h:
+        * tao/Resume_Handle.cpp:
+
+          Back out the changes I put a week ago since they didn't help
+          resovle a race condition.
+          Mon Mar 27 18:55:51 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
 Fri Apr  7 09:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp:
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 01d381e023a..82452d015f5 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -203,11 +203,6 @@ TAO_Connection_Handler::handle_output_eh (
   return_value = this->transport ()->handle_output ();
 
   this->pos_io_hook (return_value);
-
-  // Bug 1647; might need to change resume_handle's flag or
-  // change handle_input return value.
-  resume_handle.handle_input_return_value_hook(return_value);
-
   if (return_value != 0)
     {
       resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 6ce7297a70f..6d86cf027e1 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -1,6 +1,5 @@
 #include "tao/Resume_Handle.h"
 #include "tao/ORB_Core.h"
-#include "debug.h"
 
 #include "ace/Reactor.h"
 
@@ -32,50 +31,4 @@ TAO_Resume_Handle::resume_handle (void)
   this->flag_ = TAO_HANDLE_ALREADY_RESUMED;
 }
 
-void
-TAO_Resume_Handle::handle_input_return_value_hook (int& return_value)
-{
-  // RT8248: The return value is only changed from 1 to 0 if:
-  //   1) the handle_input return value wants an immediate callback
-  //      on the handle (i.e. will return "1")
-  //   2) this->resume_handle was already called
-  //   3) reactor->resume_handler was called by this->resume_handle
-  // The value is changed because you can't ask for an immediate callback
-  // on a handle that you have already given up ownership of. (RT8248)
-  if ( return_value == 1 &&
-       this->flag_ == TAO_HANDLE_ALREADY_RESUMED &&
-       this->orb_core_ &&
-       this->orb_core_->reactor ()->resumable_handler () &&
-       this->handle_ != ACE_INVALID_HANDLE)
-  {
-    // a return value of "1" means "call me back immediately;
-    // but we can't "call me back immediately" on an
-    // already-resumed handle
-    return_value = 0;
-
-    if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, "
-                  "overriding return value of 1 with retval = %d\n",
-                  return_value));
-    }
-  }
-  else if ( return_value == -1 )
-  {
-    // this covers the "connection close" case, where you want
-    // to leave the handle suspended if you're return -1 to
-    // remove the handle from the Reactor. (See ChangeLog entry
-    // Fri Dec 16 14:40:54 2005)
-    this->flag_ = TAO_HANDLE_LEAVE_SUSPENDED;
-
-    if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, "
-                  "handle_input returning -1, so handle is not resumed.\n"));
-    }
-  }
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h
index 9fd1f4949e9..d028c4108f0 100644
--- a/TAO/tao/Resume_Handle.h
+++ b/TAO/tao/Resume_Handle.h
@@ -73,12 +73,6 @@ public:
   /// reactor. Else we don't resume the handle.
   void resume_handle (void);
 
-  // Hook method called at the end of a connection handler's
-  // handle_input function.  Might override the handle_input
-  // return value or change the resume_handler's flag_ value.
-  void handle_input_return_value_hook (int& return_value);
-
-
 private:
 
   /// Our ORB Core.