Fri Sep 24 08:58:40 2004 Iliyan Jeliazkov <jeliazkov_i@ociweb.com>

          Added capability to use INS-style corbaloc references to specify SSLIOP
          references. This was motivated by a desire to access a naming service
          exclusively using SSLIOP, but needing to specify its endpoint to clients
          via a corbaloc-style IOR.

          This change originated in OCITAO 1.3a, and relies (and brings along with
          it) code from OCITAO that refactored the CORBALOC parser to support
          corbaloc and corbaname parsing via protocols beyond iiop. Thanks to
          Phil Mesnier and Jonathan Pollack for contributing this functionality.
          Their changes are credited accordingly in the text below.

1 files changed, 13 insertions, 9 deletions

diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 57bc3f9d201..7fd840cffc8 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -71,18 +71,22 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
       TAO_Connector * connector =
         (*factory)->factory ()->make_connector ();
 
-      if (connector && connector->open (orb_core) != 0)
+      if (connector)
         {
-          delete connector;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("TAO (%P|%t) unable to open connector for ")
-                             ACE_TEXT ("<%s>.\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
-                            -1);
+         if (connector->open (orb_core) != 0)
+           {
+             delete connector;
+
+             ACE_ERROR_RETURN ((LM_ERROR,
+                                ACE_LIB_TEXT ("TAO (%P|%t) unable to open connector for ")
+                                ACE_LIB_TEXT ("<%s>.\n"),
+                                ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
+                               -1);
+           }
+         this->connectors_[this->size_++] = connector;
         }
       else
-        this->connectors_[this->size_++] = connector;
+        return -1;
     }
 
   return 0;