ChangeLogTag: Tue Feb 12 15:49:53 UTC 2008 Ciju John <johnc at ociweb dot com>

16 files changed, 47 insertions, 31 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 617bc76a735..0c416c2aede 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,26 @@
+Tue Feb 12 15:49:53 UTC 2008  Ciju John  <johnc at ociweb dot com>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+          Chop out code replicated in base class.
+
+        * tao/Transport.cpp:
+          Removed tab.
+
+        * tests/Oneway_Send_Timeouts/Client.h:
+        * tests/Oneway_Send_Timeouts/Client.cpp:
+        * tests/Oneway_Send_Timeouts/Client_Task.h:
+        * tests/Oneway_Send_Timeouts/ORB_Task.h:
+        * tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc:
+        * tests/Oneway_Send_Timeouts/Server.h:
+        * tests/Oneway_Send_Timeouts/Server.cpp:
+        * tests/Oneway_Send_Timeouts/Server_Task.h:
+        * tests/Oneway_Send_Timeouts/Test.idl:
+        * tests/Oneway_Send_Timeouts/Test_i.h:
+        * tests/Oneway_Send_Timeouts/Test_i.cpp:
+        * tests/Oneway_Send_Timeouts/main.cpp:
+          Fuzz build fixes.
+
 Tue Feb 12 15:12:58 UTC 2008  Adam Mitz  <mitza@ociweb.com>
 
         * tests/Oneway_Send_Timeouts/Server_Task.h:
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 57fd368c2dd..c2bcada0c3e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -194,28 +194,6 @@ TAO::HTIOP::Transport::send_message (TAO_OutputCDR &stream,
 }
 
 int
-TAO::HTIOP::Transport::send_message_shared (TAO_Stub *stub,
-                                            TAO_Message_Semantics message_semantics,
-                                            const ACE_Message_Block *message_block,
-                                            ACE_Time_Value *max_wait_time)
-{
-  int r;
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-    r = this->send_message_shared_i (stub, message_semantics,
-                                     message_block, max_wait_time);
-  }
-
-  if (r == -1)
-    {
-      this->close_connection ();
-    }
-
-  return r;
-}
-
-int
 TAO::HTIOP::Transport::generate_request_header (TAO_Operation_Details &opdetails,
                                                 TAO_Target_Specification &spec,
                                                 TAO_OutputCDR &msg)
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 4c806b28a28..b129e94e157 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -98,11 +98,6 @@ namespace TAO
 
       virtual int register_handler (void);
 
-      virtual int send_message_shared (TAO_Stub *stub,
-                                       TAO_Message_Semantics message_semantics,
-                                       const ACE_Message_Block *message_block,
-                                       ACE_Time_Value *max_wait_time);
-
 
     public:
       /// @@TODO: These methods IMHO should have more meaningful
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 4157fabe8b7..62c6db691cc 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1010,7 +1010,7 @@ TAO_Transport::drain_queue_i (ACE_Time_Value *max_wait_time)
       if (iovcnt == ACE_IOV_MAX)
         {
           int const retval = this->drain_queue_helper (iovcnt, iov,
-	                                               max_wait_time);
+                                                       max_wait_time);
 
           now = ACE_High_Res_Timer::gettimeofday_hr ();
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index e6f9e4bf8e2..14196afba62 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -1,3 +1,4 @@
+// $Id$
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.h b/TAO/tests/Oneway_Send_Timeouts/Client.h
index 4413cacdbfb..73ff2b8282f 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef _CLIENT_
 #define _CLIENT_
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
index b40ae16d536..16f16b996be 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef _CLIENT_TASK_
 #define _CLIENT_TASK_
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
index 60b870e3799..88ce953eee7 100644
--- a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef _ORB_TASK_
 #define _ORB_TASK_
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
index 8fbfa2231b4..4bebb587f1d 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
+++ b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
@@ -1,3 +1,5 @@
+// -*- MPC -*-
+// $Id$
 
 project(*idl): taoidldefaults {
   IDL_Files {
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
index 5b707718d15..460882caa30 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
@@ -1,3 +1,4 @@
+// $Id$
 
 #include "Server.h"
 
@@ -169,7 +170,7 @@ Server::run (bool management)
 void
 Server::shutdown ()
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (shutdown_) {
     return;
   }
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.h b/TAO/tests/Oneway_Send_Timeouts/Server.h
index a19949e28fc..ce52982ca29 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef _SERVER_
 #define _SERVER_
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
index 013d41f58e9..7e32e9ff0c7 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef _SERVER_TASK_
 #define _SERVER_TASK_
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test.idl b/TAO/tests/Oneway_Send_Timeouts/Test.idl
index 9f0a7fcf03e..2794efc1f03 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Send_Timeouts/Test.idl
@@ -1,3 +1,4 @@
+// $Id$
 
 interface Test
 {
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
index e4b74618733..28ae1e4385b 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
@@ -1,3 +1,4 @@
+// $Id$
 
 #include "Test_i.h"
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.h b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
index a62a53cead8..a70c3ae45b6 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef _TEST_I_
 #define _TEST_I_
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp
index 709b5d539d1..55ce79f81d4 100644
--- a/TAO/tests/Oneway_Send_Timeouts/main.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Server_Task.h"
 #include "Client_Task.h"
 
@@ -94,12 +96,12 @@ MyMain::MyMain (int argc, ACE_TCHAR* argv[])
       }
 
       if (ACE_OS::strcasecmp (argv[p], "-s") == 0) {
-        const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : NULL);
+        const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0);
         s_init_ = this->init_server (s_args);
         p++;
       }
       else if (ACE_OS::strcasecmp (argv[p], "-c") == 0) {
-        const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : NULL);
+        const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0);
         if (s_init_) {
           this->init_client (s_args);
         }