From 02686f8d5108580e8a3d56bfe9b124405fdedd18 Mon Sep 17 00:00:00 2001 From: mcorino Date: Thu, 20 Oct 2011 09:46:10 +0000 Subject: Tue Oct 20 09:30:13 UTC 2011 Martin Corino Merged changes from Remedy work branch. --- TAO/tao/IIOP_Connector.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'TAO/tao/IIOP_Connector.cpp') diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 716376bb0d2..d28b2e87873 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -151,31 +151,31 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) if (iiop_endpoint == 0) return -1; - const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr (); + const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr (); - // Verify that the remote ACE_INET_Addr was initialized properly. - // Failure can occur if hostname lookup failed when initializing the - // remote ACE_INET_Addr. + // Verify that the remote ACE_INET_Addr was initialized properly. + // Failure can occur if hostname lookup failed when initializing the + // remote ACE_INET_Addr. #if defined (ACE_HAS_IPV6) - if (remote_address.get_type () != AF_INET && - remote_address.get_type () != AF_INET6) + if (remote_address.get_type () != AF_INET && + remote_address.get_type () != AF_INET6) #else /* ACE_HAS_IPV6 */ - if (remote_address.get_type () != AF_INET) + if (remote_address.get_type () != AF_INET) #endif /* !ACE_HAS_IPV6 */ - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - IIOP connection failed.\n") - ACE_TEXT (" This is most likely ") - ACE_TEXT ("due to a hostname lookup ") - ACE_TEXT ("failure.\n"))); - } - - return -1; - } - - return 0; + { + if (TAO_debug_level > 0) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - IIOP connection failed.\n") + ACE_TEXT (" This is most likely ") + ACE_TEXT ("due to a hostname lookup ") + ACE_TEXT ("failure.\n"))); + } + + return -1; + } + + return 0; } TAO_Transport * -- cgit v1.2.1