ChangeLogTag:Thu Jan 18 08:31:21 2001 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 15 insertions, 33 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 9bd9f55db40..4486b83277b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,8 +1,15 @@
+Thu Jan 18 08:31:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+          Fixed warnings due to duplicate definition of the
+          bidirectional_flag() method.
+
 Thu Jan 18 09:05:46 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* orbsvcs/Concurrency_Service: Added back the svc.conf file that 
-	  appears to have been missing.  Thanks to Mark L. Boriack"
- 	  <mboriack@dctd.saic.com> for reporting this.
+        * orbsvcs/Concurrency_Service: Added back the svc.conf file that
+          appears to have been missing.  Thanks to Mark L. Boriack"
+          <mboriack@dctd.saic.com> for reporting this.
 
 Wed Jan 17 10:21:46 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index a938b04d3ba..d5506907595 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -360,17 +360,17 @@ TAO_SSLIOP_Transport::send_request_header (TAO_Operation_Details &opdetails,
   // regarding this before...
   if (this->orb_core ()->bidir_giop_policy () &&
       this->messaging_object_->is_ready_for_bidirectional () &&
-      this->bidirectional_flag_ < 0)
+      this->bidirectional_flag () < 0)
     {
       this->set_bidir_context_info (opdetails);
 
-      // Set the flag to 0
-      this->bidirectional_flag_ = 0;
+      // Set the flag to 0 
+     this->bidirectional_flag (0);
     }
 
   // Modify the request id if we have BiDirectional client/server
   // setup
-  opdetails.modify_request_id (this->bidirectional_flag_);
+  opdetails.modify_request_id (this->bidirectional_flag ());
 
   // We are going to pass on this request to the underlying messaging
   // layer. It should take care of this request
@@ -392,13 +392,6 @@ TAO_SSLIOP_Transport::messaging_init (CORBA::Octet major,
 }
 
 
-void
-TAO_SSLIOP_Transport::bidirectional_flag (int flag)
-{
-  this->bidirectional_flag_ = flag;
-}
-
-
 int
 TAO_SSLIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr)
 {
@@ -414,7 +407,7 @@ TAO_SSLIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr)
 
   // As we have received a bidirectional information, set the flag to
   // 1
-  this->bidirectional_flag_ = 1;
+  this->bidirectional_flag (1);
   return this->connection_handler_->process_listen_point_list (listen_list);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 8d6904e7f8c..e4407151e87 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -141,9 +141,6 @@ public:
   virtual int messaging_init (CORBA::Octet major,
                               CORBA::Octet minor);
 
-  /// Set the bidirectional flag
-  virtual void bidirectional_flag (int flag);
-
   /// Open teh service context list and process it.
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
@@ -169,23 +166,8 @@ private:
 
   /// Our messaging object.
   TAO_Pluggable_Messaging *messaging_object_;
-
-  /// Have we sent any info on bidirectional information or have we
-  /// received any info regarding making the connection
-  /// served by this transport bidirectional. This is essentially for
-  /// this -- we dont want to send the bidirectional context info more
-  /// than once on the connection. Why? Waste of marshalling and
-  /// demarshalling time on the client. On the server side, we need
-  /// this flag for this -- once a client that has established the
-  /// connection asks the server to use the connection both ways, we
-  /// *dont* want the server to go pack service info to the
-  /// client. That would be *bad*.. The value of this flag will be 0
-  /// if the client sends info and 1 if the server receives the info.
-  int bidirectional_flag_;
-
 };
 
 
 #include "ace/post.h"
-
 #endif  /* TAO_SSLIOP_TRANSPORT_H */