ChangeLogTag:Tue Mar 27 08:15:34 2001 Carlos O'Ryan <coryan@uci.edu>

4 files changed, 42 insertions, 30 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e0ac3438f19..f5296edb088 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,26 +1,35 @@
+Tue Mar 27 08:15:34 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+          Fixed minor syntax error, i.e. removed extra right paren.
+
+        * tao/Protocols_Hooks.h:
+          Add missing #include for minimum CORBA builds.
+
 Tue Mar 27 05:36:10 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* tao/Wait_On_Leader_Follower.cpp (connection_closed): No need for
-	  ACE_NESTED_CLASS.
+        * tao/Wait_On_Leader_Follower.cpp (connection_closed): No need for
+          ACE_NESTED_CLASS.
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp (destroy): Must check for a
+          non-zero protocol object before destroying it.  We must also
+          destroy the protocol objects in the reverse flowspec set.
 
-	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp (destroy): Must check for a
-	  non-zero protocol object before destroying it.  We must also
-	  destroy the protocol objects in the reverse flowspec set.
+        * orbsvcs/tests/AVStreams:
 
-	* orbsvcs/tests/AVStreams:
+          - Rename Use_Case to Component_Switching.
 
-	  - Rename Use_Case to Component_Switching.
+          - Rename Simple to Simple_Two_Stage.
 
-	  - Rename Simple to Simple_Two_Stage.	  
+          - Revamped the following tests:
 
-	  - Revamped the following tests:
-	    
-	    - Simple_Two_Stage
-	    - Simple_Three_Stage
-	    - Asynch_Three_Stage 
-	    - Component_Switching
+            - Simple_Two_Stage
+            - Simple_Three_Stage
+            - Asynch_Three_Stage
+            - Component_Switching
 
-	* $ACE_ROOT/bin/auto_run_tests.lst: Added new AV tests.
+        * $ACE_ROOT/bin/auto_run_tests.lst: Added new AV tests.
 
 Tue Mar 27 09:02:03 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
index 47961e5db40..fca4ecc35f5 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
@@ -214,7 +214,7 @@ TAO_DIOP_Connection_Handler::activate (long flags,
   // @@ Frank: Not disabled yet...
 
   // Set the id in the transport now that we're active.
-  this->transport ()->id ((int) this->get_handle ()));
+  this->transport ()->id ((int) this->get_handle ());
 
   return TAO_DIOP_SVC_HANDLER::activate (flags,
                                          n_threads,
@@ -266,20 +266,22 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
                  rm));
 
   --this->pending_upcalls_;
-  if (this->pending_upcalls_ == 0 &&
-      this->is_registered ())
+  if (this->pending_upcalls_ == 0)
     {
-      // @@ Frank: Added reactor check.  not sure if this is right?
-      if (this->reactor ())
-      {
-         // Make sure there are no timers.
-         this->reactor ()->cancel_timer (this);
-      }
-
-      // Set the flag to indicate that it is no longer registered with
-      // the reactor, so that it isn't included in the set that is
-      // passed to the reactor on ORB destruction.
-      this->is_registered (0);
+      if (this->is_registered ())
+        {
+          // @@ Frank: Added reactor check.  not sure if this is right?
+          if (this->reactor ())
+            {
+              // Make sure there are no timers.
+              this->reactor ()->cancel_timer (this);
+            }
+
+          // Set the flag to indicate that it is no longer registered with
+          // the reactor, so that it isn't included in the set that is
+          // passed to the reactor on ORB destruction.
+          this->is_registered (0);
+        }
 
       // Close the handle..
       if (this->get_handle () != ACE_INVALID_HANDLE)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index e3d4123a8a9..73285a56d01 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -158,7 +158,7 @@ TAO_SSLIOP_Connection_Handler::activate (long flags,
                  THR_BOUND));
 
   // Set the id in the transport now that we're active.
-  this->transport ()->id ((int) this->get_handle ()));
+  this->transport ()->id ((int) this->get_handle ());
 
   return TAO_SSL_SVC_HANDLER::activate (flags,
                                         n_threads,
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index d532e1b0429..8776eae39e7 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -15,6 +15,7 @@
 #define TAO_PROTOCOLS_HOOKS_H
 #include "ace/pre.h"
 
+#include "corbafwd.h"
 #include "RTCORBAC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)