Mon Mar 16 08:54:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
          Use CORBA::is_nil and small optimizations

        * tao/DynamicInterface/DII_Reply_Dispatcher.h:
        * tao/Codeset/Codeset.cpp:
          Layout changes

4 files changed, 19 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fc173960d0d..5f29dcfc572 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Mar 16 08:54:22 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+          Use CORBA::is_nil and small optimizations
+
+        * tao/DynamicInterface/DII_Reply_Dispatcher.h:
+        * tao/Codeset/Codeset.cpp:
+          Layout changes
+
 Mon Mar 16 08:34:22 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Exclusive_TMS.h:
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp
index c946ad4c3b5..ce56549d729 100644
--- a/TAO/tao/Codeset/Codeset.cpp
+++ b/TAO/tao/Codeset/Codeset.cpp
@@ -42,6 +42,7 @@ TAO_Codeset_Initializer::init (void)
 
   result += ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Codeset_Manager_Factory,1); // force replacement
+
   return result;
 }
 
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 3ac767ff576..65db3c87dc3 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -51,8 +51,6 @@ public:
   TAO_DII_Deferred_Reply_Dispatcher (const CORBA::Request_ptr req,
                                      TAO_ORB_Core *orb_core);
 
-
-
   /// The Reply_Dispatcher methods
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
 
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 4b8d64d2552..3b556b2816a 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -36,7 +36,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
   CORBA::Policy_var client_protocol_policy_base =
     TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL, *r);
 
-  if (client_protocol_policy_base.ptr () == 0)
+  if (CORBA::is_nil(client_protocol_policy_base.in ()))
     {
       do
         {
@@ -119,9 +119,9 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
   // policy with no success.  Throw exception.
   if (!valid_profile_found)
     {
-      if (r.inconsistent_policies ())
+      CORBA::PolicyList *p = r.inconsistent_policies ();
+      if (p)
         {
-          CORBA::PolicyList *p = r.inconsistent_policies ();
 
           p->length (1);
           (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy);
@@ -161,14 +161,14 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
   CORBA::Short max_priority = 0;
 
   // If the priority model policy is not set.
-  if (priority_model_policy.ptr () == 0)
+  if (CORBA::is_nil (priority_model_policy.in ()))
     {
       // Bands without priority model do not make sense.
-      if (bands_policy.ptr () != 0)
+      if (!CORBA::is_nil (bands_policy.in ()))
         {
-          if (r.inconsistent_policies ())
+          CORBA::PolicyList *p = r.inconsistent_policies ();
+          if (p)
             {
-              CORBA::PolicyList *p = r.inconsistent_policies ();
 
               p->length (1);
               (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
@@ -247,10 +247,9 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
                   // If priority doesn't fall into any of the bands.
                   if (!in_range)
                     {
-                      if (r.inconsistent_policies ())
+                      CORBA::PolicyList *p = r.inconsistent_policies ();
+                      if (p)
                         {
-
-                          CORBA::PolicyList *p = r.inconsistent_policies ();
                           p->length (2);
                           (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
                           (*p)[1u] =