ChangeLogTag: Fri Sep 12 19:21:07 UTC 2008 Adam Mitz <mitza@ociweb.com>

7 files changed, 29 insertions, 18 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 77a095b6ba6..9f2a0c295ef 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Fri Sep 12 19:21:07 UTC 2008  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/Transport.h:
+        * tao/Transport.cpp:
+
+          Removed the ACE_Lock object that wrapped output_cdr_mutex_, we'll
+          just use the mutex object directly (TAO_SYNCH_MUTEX).
+
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/Synch_Invocation.cpp:
+
+          Fixed-up all uses of TAO::Transport output_cdr_lock() for the new
+          return type.
+
 Tue Sep  9 22:25:46 UTC 2008  Ciju John  <johnc at ociweb dot com>
 
         * tests/AMI_Buffering/client.cpp:
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index af0170fa6d4..ae7736c018c 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -124,8 +124,8 @@ namespace TAO
         throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
       }
 
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
-                      , TAO_INVOKE_FAILURE);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, transport->output_cdr_lock (),
+                      TAO_INVOKE_FAILURE);
 
     transport->messaging_object ()->out_stream ().reset_byte_order (
         request_->_tao_byte_order ());
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index d87c0e10741..d4f79f30a03 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -61,8 +61,8 @@ namespace TAO
 
     Invocation_Status s = TAO_INVOKE_FAILURE;
     {
-      ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
-                        , TAO_INVOKE_FAILURE);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon,
+                        transport->output_cdr_lock (), TAO_INVOKE_FAILURE);
       TAO_OutputCDR &cdr = transport->out_stream ();
 
       if (transport->generate_locate_request (tspec, this->details_, cdr) == -1)
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 6799c351a0d..ae797cde3e9 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -65,8 +65,8 @@ namespace TAO
             throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
           }
 
-        ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
-                          , TAO_INVOKE_FAILURE);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon,
+                          transport->output_cdr_lock (), TAO_INVOKE_FAILURE);
 
         TAO_OutputCDR & cdr =
           this->resolver_.transport ()->messaging_object ()->out_stream ();
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 2ca732e4083..334f17b0762 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -83,8 +83,8 @@ namespace TAO
             throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
           }
 
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
-                          , TAO_INVOKE_FAILURE);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon,
+                          transport->output_cdr_lock (), TAO_INVOKE_FAILURE);
 
         TAO_OutputCDR &cdr = transport->out_stream ();
 
@@ -659,8 +659,8 @@ namespace TAO
           }
 
   {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
-                            , TAO_INVOKE_FAILURE);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, transport->output_cdr_lock (),
+                      TAO_INVOKE_FAILURE);
 
     TAO_OutputCDR &cdr = transport->out_stream ();
 
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 6887dc1b9e4..4356e0efe27 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -167,11 +167,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   , stats_ (0)
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
   , flush_in_post_open_ (0)
-  , output_cdr_lock_ (0)
 {
-  ACE_NEW (this->output_cdr_lock_,
-     ACE_Lock_Adapter <TAO_SYNCH_MUTEX> (this->output_cdr_mutex_));
-
   ACE_NEW (this->messaging_object_,
             TAO_GIOP_Message_Base (orb_core,
                                    this,
@@ -2638,10 +2634,10 @@ TAO_Transport::out_stream (void)
   return this->messaging_object ()->out_stream ();
 }
 
-ACE_Lock*
+TAO_SYNCH_MUTEX &
 TAO_Transport::output_cdr_lock (void)
 {
-  return this->output_cdr_lock_;
+  return this->output_cdr_mutex_;
 }
 
 void
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 8f09ecf5c00..4d85e2f4fbc 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -554,7 +554,7 @@ public:
   TAO_OutputCDR &out_stream (void);
 
   /// Accessor for synchronizing Transport OutputCDR access
-  ACE_Lock* output_cdr_lock (void);
+  TAO_SYNCH_MUTEX &output_cdr_lock (void);
 
   /// Set the flush in post open flag
   void set_flush_in_post_open (void);
@@ -1090,7 +1090,6 @@ private:
   bool flush_in_post_open_;
 
   /// lock for synchronizing Transport OutputCDR access
-  mutable ACE_Lock *output_cdr_lock_;
   mutable TAO_SYNCH_MUTEX output_cdr_mutex_;
 
   /*