ChangeLogTag: Mon Apr 28 12:24:39 2003 Irfan Pyarali <irfan@oomworks.com>

4 files changed, 20 insertions, 18 deletions

diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 5d9aadd2ee1..a60fd1c2a60 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -130,7 +130,7 @@ void
 TAO_RT_POA::validate_priority (RTCORBA::Priority priority
                                ACE_ENV_ARG_DECL)
 {
-  if (priority < RTCORBA::minPriority 
+  if (priority < RTCORBA::minPriority
            // The line below will always be false unless the value of
            // RTCORBA::maxPriority, which is now assigned the value of
            // 32767, is changed in RTCORBA.pidl.
@@ -926,9 +926,12 @@ TAO_RT_POA::server_protocol (void)
     {
       TAO_Policy_Manager *policy_manager =
         this->orb_core_.policy_manager ();
+
       if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+        result =
+          policy_manager->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
     }
+
   return result;
 }
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 0f3886854d8..b423dd4f8c8 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -73,15 +73,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
     poa.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-
   if (req.transport ()->tag () == IOP::TAG_INTERNET_IOP)
     {
-      /*
-        int send_buffer_size;
-        int recv_buffer_size;
-        int no_delay;
-        int enable_network_priority;
-      */
       const char protocol [] = "iiop";
       const char *protocol_type = protocol;
 
@@ -89,7 +82,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
         ACE_dynamic_cast (TAO_IIOP_Transport *,
                           req.transport ());
 
-      CORBA::Policy* policy = poa.server_protocol ();
+      CORBA::Policy_var policy = poa.server_protocol ();
 
       int result =
         tph->update_server_protocol_properties (
@@ -100,14 +93,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
       if (result != 0)
         ACE_ERROR((LM_ERROR,
                    "Error in getting the effective protocol properties\n"));
-
-      /*
-        iiop_transport ()->connection_handler ()->update_protocol_properties (send_buffer_size,
-        recv_buffer_size,
-        no_delay,
-        enable_network_priority);
-      */
-  }
+    }
 
   const char *priority_model;
   RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index d85c4bf4515..a87e3019e26 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -66,6 +66,15 @@ TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
 TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory (void)
 {
   // Destructor
+  TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
+
+  for (TAO_ProtocolFactorySetItor iterator =
+         this->protocol_factories_.begin ();
+       iterator != end;
+       ++iterator)
+    delete *iterator;
+
+  this->protocol_factories_.reset ();
 }
 
 int
@@ -236,6 +245,8 @@ TAO_Advanced_Resource_Factory::load_default_protocols (void)
   this->protocol_factories_ =
     this->TAO_Default_Resource_Factory::protocol_factories_;
 
+  this->TAO_Default_Resource_Factory::protocol_factories_.reset ();
+
   if (r == -1)
     return -1;
   // Load the UIOP and SHMIOP protocols...
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 91aacacbd5b..02ba99a1fed 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -314,7 +314,9 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // The Root POA default name.
+#if !defined (TAO_DEFAULT_ROOTPOA_NAME)
 #define TAO_DEFAULT_ROOTPOA_NAME   ""
+#endif /* TAO_DEFAULT_ROOTPOA_NAME */
 
 // Minimum CORBA
 #if !defined (TAO_HAS_MINIMUM_CORBA)