ChangeLogTag: Thu Apr 20 13:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 15 insertions, 16 deletions

diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
index 1f01eca39f6..edda3e1c449 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -86,28 +86,26 @@ TAO_Asynch_Reply_Dispatcher_Base::reply_timed_out (void)
 {
 }
 
-long
+void
 TAO_Asynch_Reply_Dispatcher_Base::incr_refcount (void)
 {
-  ACE_GUARD_RETURN (ACE_Lock,
-                    mutex,
-                    *this->lock_,
-                    -1);
-  return ++this->refcount_;
+  ACE_GUARD (ACE_Lock,
+             mutex,
+             *this->lock_);
+  ++this->refcount_;
 }
 
-long
+void
 TAO_Asynch_Reply_Dispatcher_Base::decr_refcount (void)
 {
   {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      mutex,
-                      *this->lock_,
-                      -1);
+    ACE_GUARD (ACE_Lock,
+               mutex,
+               *this->lock_);
     --this->refcount_;
 
     if (this->refcount_ > 0)
-      return this->refcount_;
+      return;
   }
 
   if (this->allocator_)
@@ -121,16 +119,17 @@ TAO_Asynch_Reply_Dispatcher_Base::decr_refcount (void)
       delete this;
     }
 
-  return 0;
+  return;
 }
 
 bool
 TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void)
 {
   if (this->is_reply_dispatched_)
-    return false;
-
-  if (!this->is_reply_dispatched_)
+    {
+      return false;
+    }
+  else
     {
       ACE_GUARD_RETURN (ACE_Lock,
                         mutex,