diff options
Diffstat (limited to 'TAO/tao/Connector_Registry.cpp')
| -rw-r--r-- | TAO/tao/Connector_Registry.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 7fd840cffc8..57bc3f9d201 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -71,22 +71,18 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) TAO_Connector * connector = (*factory)->factory ()->make_connector (); - if (connector) + if (connector && connector->open (orb_core) != 0) { - 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; + 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); } else - return -1; + this->connectors_[this->size_++] = connector; } return 0; |