*** empty log message ***

6 files changed, 38 insertions, 7 deletions

diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index aee04e27cc0..6d4dd064eff 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -50,6 +50,7 @@ public:
 };
 
 
+
 // ****************************************************************
 
 /**
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 211cf10721c..5f0878d1798 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -299,6 +299,11 @@ TAO_IIOP_Transport::send_request_header (TAO_Operation_Details &opdetails,
                                          TAO_Target_Specification &spec,
                                          TAO_OutputCDR &msg)
 {
+  // Check whether we have a Bi Dir IIOP policy set
+  if (this->orb_core ()->bidir_giop_policy ())
+    {
+
+    }
   // We are going to pass on this request to the underlying messaging
   // layer. It should take care of this request
   if (this->messaging_object_->generate_request_header (opdetails,
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 30410b8de31..2745a4a3a07 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -152,7 +152,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     ior_interceptors_ (),
     parser_registry_ (),
-    connection_cache_ ()
+    connection_cache_ (),
+    bidir_giop_policy (0)
 {
 #if defined(ACE_MVS)
   ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859);
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 5facba63bc5..c829788c543 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -649,8 +649,8 @@ public:
   /// Give each registered IOR interceptor the opportunity to add
   /// tagged components to profiles of each created servant.
   void establish_components (TAO_MProfile &mp,
-			     CORBA::PolicyList *policy_list,
-			     CORBA::Environment &ACE_TRY_ENV);
+                             CORBA::PolicyList *policy_list,
+                             CORBA::Environment &ACE_TRY_ENV);
 
   /// Create a new object, use the adapter registry to create a
   /// collocated object, if not possible then create a regular
@@ -824,6 +824,14 @@ public:
   /// Return the underlying connection cache.
   TAO_Connection_Cache_Manager &connection_cache (void);
 
+  /// Set and Get methods to indicate whether a BiDir IIOP policy has
+  /// been set in the POA.
+  /// @@ At present, the value will be true even if one of the POA's
+  ///    is set with the Bi Dir GIOP policy.
+  CORBA::Boolean bidir_giop_policy (void);
+  void bidir_giop_policy (CORBA::Boolean);
+
+
   /**
    * Return the table that maps object key/name to de-stringified
    * object reference.  The contents of this table do not correspond
@@ -966,9 +974,9 @@ protected:
   // to be "Advanced_Resource_Factory".
   static const char *resource_factory_name_;
 
-  // Name of the service object for DII request creation that needs 
-  // to be instantiated. The default value is "Dynamic_Adaper". If 
-  // TAO_DynamicInterface is linked, dynamic_adapter_name() will be 
+  // Name of the service object for DII request creation that needs
+  // to be instantiated. The default value is "Dynamic_Adaper". If
+  // TAO_DynamicInterface is linked, dynamic_adapter_name() will be
   // called to set the value to "Concrete_Dynamic_Adapter".
   static const char *dynamic_adapter_name_;
 
@@ -1156,6 +1164,8 @@ protected:
   /// TAO's connection cache.
   TAO_Connection_Cache_Manager connection_cache_;
 
+  /// Bir Dir GIOP policy value
+  CORBA::Boolean bidir_giop_policy_;
 };
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index efad67ae024..cd03c48d3f6 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -28,6 +28,19 @@ TAO_ORB_Core::connection_cache (void)
   return this->connection_cache_;
 }
 
+ACE_INLINE CORBA::Boolean
+TAO_ORB_Core::bidir_giop_policy (void)
+{
+  return this->bidir_giop_policy_;
+}
+
+ACE_INLINE void
+TAO_ORB_Core::bidir_giop_policy (CORBA::Boolean val)
+{
+  this->bidir_giop_policy_ = val;
+}
+
+
 ACE_INLINE TAO_Object_Ref_Table &
 TAO_ORB_Core::object_ref_table (void)
 {
@@ -704,7 +717,7 @@ TAO_ORB_Core::add_interceptor (
    CORBA_Environment &ACE_TRY_ENV)
 {
   this->ior_interceptors_.add_interceptor (interceptor,
-					   ACE_TRY_ENV);
+                                           ACE_TRY_ENV);
 }
 
 ACE_INLINE TAO_IORInterceptor_List::TYPE &
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 6ef8026c767..e482a86e6fc 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -3884,6 +3884,7 @@ TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
     }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
+  ///@@@ FOr BiDIr GIOP....
 
   ACE_THROW (PortableServer::POA::InvalidPolicy ());
 }