diff options
Diffstat (limited to 'TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp')
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 877b85cd075..f5a0bdf3355 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -25,6 +25,7 @@ ACE_RCSID(Strategies, SHMIOP_Connection_Handler, "$Id$") TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), + pending_upcalls_ (1), resume_flag_ (TAO_DOESNT_RESUME_CONNECTION_HANDLER) { // This constructor should *never* get called, it is just here to @@ -37,15 +38,16 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag, + CORBA::Boolean /*flag*/, void *) : TAO_SHMIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core), + pending_upcalls_ (1), resume_flag_ (TAO_DOESNT_RESUME_CONNECTION_HANDLER) { TAO_SHMIOP_Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO_SHMIOP_Transport(this, orb_core, flag)); + TAO_SHMIOP_Transport(this, orb_core, 0)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); @@ -180,10 +182,8 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE handle, handle, rm)); - long pending = - this->decr_pending_upcalls (); - - if (pending <= 0) + --this->pending_upcalls_; + if (this->pending_upcalls_ <= 0) { if (this->transport ()->wait_strategy ()->is_registered ()) { @@ -268,7 +268,7 @@ int TAO_SHMIOP_Connection_Handler::handle_input (ACE_HANDLE) { // Increase the reference count on the upcall that have passed us. - this->incr_pending_upcalls (); + this->pending_upcalls_++; this->resume_flag_ = TAO_RESUMES_CONNECTION_HANDLER; @@ -278,7 +278,7 @@ TAO_SHMIOP_Connection_Handler::handle_input (ACE_HANDLE) int retval = this->transport ()->handle_input_i (resume_handle); // The upcall is done. Bump down the reference count - if (this->decr_pending_upcalls () <= 0) + if (--this->pending_upcalls_ <= 0) retval = -1; if (retval == -1) |