- Fixed minor bug in Ice::Application (error message was missing ": ")

- Fixed bug where exceptions weren't correctly catched by the endpoint host
  resolver when doing the non-blocking getAddresses call.

1 files changed, 11 insertions, 3 deletions

diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index f3505005f28..2ae93da7362 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -44,10 +44,18 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, const E
     // Try to get the addresses without DNS lookup. If this doesn't work, we queue a resolve
     // entry and the thread will take care of getting the endpoint addresses.
     //
-    vector<struct sockaddr_in> addrs = getAddresses(host, port, false);
-    if(!addrs.empty())
+    try
     {
-        callback->connectors(endpoint->connectors(addrs));
+        vector<struct sockaddr_in> addrs = getAddresses(host, port, false);
+        if(!addrs.empty())
+        {
+            callback->connectors(endpoint->connectors(addrs));
+            return;
+        }
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        callback->exception(ex);
         return;
     }