*** empty log message ***

4 files changed, 13 insertions, 27 deletions

diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 3eec9573528..985dbbf44c8 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -17,6 +17,7 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
   :orb_core_ (orb_core),
    transport_ (0),
    tss_resources_ (orb_core->get_tss_resources ())
+  //,   is_registered_ (0)
 {
 }
 
@@ -92,9 +93,7 @@ TAO_Connection_Handler::svc_i (void)
   while (!this->orb_core_->has_shutdown ()
          && result >= 0)
     {
-      result =
-        this->transport_->handle_input_i (ACE_INVALID_HANDLE,
-                                          max_wait_time);
+      result = this->handle_input_i (ACE_INVALID_HANDLE, max_wait_time);
 
       if (result == -1 && errno == ETIME)
         {
@@ -126,13 +125,9 @@ TAO_Connection_Handler::svc_i (void)
 void
 TAO_Connection_Handler::transport (TAO_Transport* transport)
 {
-  // @@ Maybe this is not the place to increase reference counts. This
-  // method can be easily  pass of as a set method. Need to look at a
-  // cleaner method of doing this - NB
-  if (this->transport_ != 0)
-    {
-      this->transport_->connection_handler_closing ();
-    }
+  if (this->transport_ != 0) {
+    this->transport_->connection_handler_closing ();
+  }
 
   this->transport_ = TAO_Transport::_duplicate (transport);
 }
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index c5c7b734b1c..14aa7830597 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -84,9 +84,6 @@ public:
   /// Get the underlying handle
   virtual ACE_HANDLE fetch_handle (void) = 0;
 
-  /// Need to be implemented by the underlying protocol objects
-  virtual int handle_input_i (ACE_HANDLE = ACE_INVALID_HANDLE,
-                              ACE_Time_Value *max_wait_time = 0) = 0;
 protected:
 
   /// Return our TAO_ORB_Core pointer
@@ -104,9 +101,9 @@ protected:
   /// Object.
   int svc_i (void);
 
-#if !defined (TAO_CONNECTION_HANDLER_BUF_SIZE)
-#   define TAO_CONNECTION_HANDLER_BUF_SIZE 1024
-#endif /*TAO_CONNECTION_HANDLER_BUF_SIZE*/
+  /// Need to be implemented by the underlying protocol objects
+  virtual int handle_input_i (ACE_HANDLE = ACE_INVALID_HANDLE,
+                              ACE_Time_Value *max_wait_time = 0) = 0;
 
 private:
 
@@ -118,6 +115,9 @@ private:
 
   /// Cached tss resources of the ORB that activated this object.
   TAO_ORB_Core_TSS_Resources *tss_resources_;
+
+  /// Are we registered with the reactor?
+  // CORBA::Boolean is_registered_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
index b3038ee5e03..684dd9de27e 100644
--- a/TAO/tao/Dynamic.pidl
+++ b/TAO/tao/Dynamic.pidl
@@ -42,18 +42,9 @@
 
 module Dynamic {
 
-// For now, jsut commented this out unutil it is implemented.
-
- enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
   struct Parameter {
     any argument;
-    //    CORBA::ParameterMode mode;
-    ParameterMode mode;
+    CORBA::ParameterMode mode;
   };
 
   typedef sequence<Parameter> ParameterList;
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 36fa3cd8ee6..6b61524507c 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -176,7 +176,7 @@ TAO_IIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
                     ACE_TEXT ("making a new connection\n")));
 
       // Purge connections (if necessary)
-      // this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->transport_cache ()->purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection