Thu Jun 5 22:03:18 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>

        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h:
        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp:
        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
          As a performance enhancement, allow the load balancing strategy
          to be set globally, overriding the per-object-group setting. No
          change to the default behavior which is per-group, but now pass
          -l round_robin or -l random to set the global strategy.

        * tao/IIOP_Profile.cpp:
          As another performance enhancement, avoid the preferred interface
          calls if no list of interfaces was provided.

        * tao/Storable_FlatFileStream.cpp:
          clean up debug output.

1 files changed, 6 insertions, 4 deletions

diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index b9147d11d3a..3795a767fe6 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -116,10 +116,12 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
       this->endpoint_.object_addr_.set_type (-1);
 
       const char* csv = this->orb_core()->orb_params()->preferred_interfaces();
-      bool const enforce =
-        this->orb_core()->orb_params()->enforce_pref_interfaces();
-      this->count_ += this->endpoint_.preferred_interfaces(csv, enforce, *this);
-
+      if (csv != 0 && *csv != '\0')
+        {
+          bool const enforce =
+            this->orb_core()->orb_params()->enforce_pref_interfaces();
+          this->count_ += this->endpoint_.preferred_interfaces(csv, enforce, *this);
+        }
       return 1;
     }