ChangeLogTag: Tue Sep 02 09:00:00 UTC 2008 Simon Massey <sma at prismtech dot com>

3 files changed, 45 insertions, 38 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 978d90aa3e0..5e4b2a04d5b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 02 09:00:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * tao/Synch_Invocation.cpp:
+        * tao/Transport.cpp:
+
+          Un-tabify these to correct fuzz errors.
+
 Mon Sep  1 20:18:51 UTC 2008  Ciju John  <johnc at ociweb dot com>
 
         * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index bf6bdd53f41..2ca732e4083 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -83,7 +83,7 @@ namespace TAO
             throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
           }
 
-	ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
                           , TAO_INVOKE_FAILURE);
 
         TAO_OutputCDR &cdr = transport->out_stream ();
@@ -99,7 +99,7 @@ namespace TAO
         this->marshal_data (cdr);
 
 
-	// Register a reply dispatcher for this invocation. Use the
+  // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
         TAO_Bind_Dispatcher_Guard dispatch_guard (
           this->details_.request_id (),
@@ -121,7 +121,7 @@ namespace TAO
                                 TAO_Transport::TAO_TWOWAY_REQUEST,
                                 max_wait_time);
 
-	ace_mon.release();
+  ace_mon.release();
 
 #if TAO_HAS_INTERCEPTORS == 1
         // @@NOTE: Too much code repetition.
@@ -658,42 +658,42 @@ namespace TAO
             throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
           }
 
-	{
-	  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
+  {
+    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *transport->output_cdr_lock ()
                             , TAO_INVOKE_FAILURE);
 
-	  TAO_OutputCDR &cdr = transport->out_stream ();
-
-	  cdr.message_attributes (this->details_.request_id (),
-				  this->resolver_.stub (),
-				  TAO_Transport::TAO_ONEWAY_REQUEST,
-				  max_wait_time,
-				  false);
-
-	  this->write_header (cdr);
-
-	  this->marshal_data (cdr);
-
-	  countdown.update ();
-
-	  if (transport->is_connected ())
-	    {
-	      // We have a connected transport so we can send the message
-	      s = this->send_message (cdr,
-				      TAO_Transport::TAO_ONEWAY_REQUEST,
-				      max_wait_time);
-	    }
-	  else
-	    {
-	      if (TAO_debug_level > 4)
-		ACE_DEBUG ((LM_DEBUG,
-			    "TAO (%P|%t) - Synch_Oneway_Invocation::"
-			    "remote_oneway, queueing message\n"));
-
-	      if (transport->format_queue_message (cdr, max_wait_time) != 0)
-		s = TAO_INVOKE_FAILURE;
-	    }
-	}
+    TAO_OutputCDR &cdr = transport->out_stream ();
+
+    cdr.message_attributes (this->details_.request_id (),
+          this->resolver_.stub (),
+          TAO_Transport::TAO_ONEWAY_REQUEST,
+          max_wait_time,
+          false);
+
+    this->write_header (cdr);
+
+    this->marshal_data (cdr);
+
+    countdown.update ();
+
+    if (transport->is_connected ())
+      {
+        // We have a connected transport so we can send the message
+        s = this->send_message (cdr,
+              TAO_Transport::TAO_ONEWAY_REQUEST,
+              max_wait_time);
+      }
+    else
+      {
+        if (TAO_debug_level > 4)
+    ACE_DEBUG ((LM_DEBUG,
+          "TAO (%P|%t) - Synch_Oneway_Invocation::"
+          "remote_oneway, queueing message\n"));
+
+        if (transport->format_queue_message (cdr, max_wait_time) != 0)
+    s = TAO_INVOKE_FAILURE;
+      }
+  }
 
 #if TAO_HAS_INTERCEPTORS == 1
         s = this->receive_other_interception ();
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 5147b49229f..341aa841f6d 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -170,7 +170,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   , output_cdr_lock_ (0)
 {
   ACE_NEW (this->output_cdr_lock_,
-	   ACE_Lock_Adapter <TAO_SYNCH_MUTEX> (this->output_cdr_mutex_));
+     ACE_Lock_Adapter <TAO_SYNCH_MUTEX> (this->output_cdr_mutex_));
 
   ACE_NEW (this->messaging_object_,
             TAO_GIOP_Message_Base (orb_core,