zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -38,8 +38,14 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
@@ -109,65 +115,65 @@ class LookupReply : virtual public ::IceProxy::Ice::Object
 {
 public:
 
-    void foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx)
+    void foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx)
     {
-        foundObjectById(id, prx, 0);
+        foundObjectById(__p_id, __p_prx, 0);
     }
-    void foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& __ctx)
+    void foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context& __ctx)
     {
-        foundObjectById(id, prx, &__ctx);
+        foundObjectById(__p_id, __p_prx, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_foundObjectById(id, prx, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
+        return begin_foundObjectById(__p_id, __p_prx, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
     }
     ::Ice::AsyncResultPtr
-    begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_foundObjectById(id, prx, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_foundObjectById(__p_id, __p_prx, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_foundObjectById(id, prx, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
+        return begin_foundObjectById(__p_id, __p_prx, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_foundObjectById(id, prx, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_foundObjectById(__p_id, __p_prx, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
 #endif
 
-    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx)
+    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx)
     {
-        return begin_foundObjectById(id, prx, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_foundObjectById(__p_id, __p_prx, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context& __ctx)
     {
-        return begin_foundObjectById(id, prx, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_foundObjectById(__p_id, __p_prx, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundObjectById(id, prx, 0, __del, __cookie);
+        return begin_foundObjectById(__p_id, __p_prx, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundObjectById(id, prx, &__ctx, __del, __cookie);
+        return begin_foundObjectById(__p_id, __p_prx, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::IceDiscovery::Callback_LookupReply_foundObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::IceDiscovery::Callback_LookupReply_foundObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundObjectById(id, prx, 0, __del, __cookie);
+        return begin_foundObjectById(__p_id, __p_prx, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_LookupReply_foundObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_LookupReply_foundObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundObjectById(id, prx, &__ctx, __del, __cookie);
+        return begin_foundObjectById(__p_id, __p_prx, &__ctx, __del, __cookie);
     }
 
     void end_foundObjectById(const ::Ice::AsyncResultPtr&);
@@ -179,65 +185,65 @@ private:
     
 public:
 
-    void foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup)
+    void foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup)
     {
-        foundAdapterById(id, prx, isReplicaGroup, 0);
+        foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, 0);
     }
-    void foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& __ctx)
+    void foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context& __ctx)
     {
-        foundAdapterById(id, prx, isReplicaGroup, &__ctx);
+        foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
     }
     ::Ice::AsyncResultPtr
-    begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
 #endif
 
-    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup)
+    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup)
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context& __ctx)
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, 0, __del, __cookie);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, &__ctx, __del, __cookie);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::IceDiscovery::Callback_LookupReply_foundAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::IceDiscovery::Callback_LookupReply_foundAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, 0, __del, __cookie);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_LookupReply_foundAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_LookupReply_foundAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_foundAdapterById(id, prx, isReplicaGroup, &__ctx, __del, __cookie);
+        return begin_foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, &__ctx, __del, __cookie);
     }
 
     void end_foundAdapterById(const ::Ice::AsyncResultPtr&);
@@ -364,65 +370,65 @@ class Lookup : virtual public ::IceProxy::Ice::Object
 {
 public:
 
-    void findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply)
+    void findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply)
     {
-        findObjectById(domainId, id, reply, 0);
+        findObjectById(__p_domainId, __p_id, __p_reply, 0);
     }
-    void findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx)
+    void findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
     {
-        findObjectById(domainId, id, reply, &__ctx);
+        findObjectById(__p_domainId, __p_id, __p_reply, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_findObjectById(domainId, id, reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
     }
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findObjectById(domainId, id, reply, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_findObjectById(domainId, id, reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findObjectById(domainId, id, reply, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
 #endif
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply)
     {
-        return begin_findObjectById(domainId, id, reply, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
     {
-        return begin_findObjectById(domainId, id, reply, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(domainId, id, reply, 0, __del, __cookie);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(domainId, id, reply, &__ctx, __del, __cookie);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceDiscovery::Callback_Lookup_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::IceDiscovery::Callback_Lookup_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(domainId, id, reply, 0, __del, __cookie);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_Lookup_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_Lookup_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(domainId, id, reply, &__ctx, __del, __cookie);
+        return begin_findObjectById(__p_domainId, __p_id, __p_reply, &__ctx, __del, __cookie);
     }
 
     void end_findObjectById(const ::Ice::AsyncResultPtr&);
@@ -434,65 +440,65 @@ private:
     
 public:
 
-    void findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply)
+    void findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply)
     {
-        findAdapterById(domainId, id, reply, 0);
+        findAdapterById(__p_domainId, __p_id, __p_reply, 0);
     }
-    void findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx)
+    void findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
     {
-        findAdapterById(domainId, id, reply, &__ctx);
+        findAdapterById(__p_domainId, __p_id, __p_reply, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_findAdapterById(domainId, id, reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
     }
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findAdapterById(domainId, id, reply, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return begin_findAdapterById(domainId, id, reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findAdapterById(domainId, id, reply, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
 #endif
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply)
     {
-        return begin_findAdapterById(domainId, id, reply, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
     {
-        return begin_findAdapterById(domainId, id, reply, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(domainId, id, reply, 0, __del, __cookie);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(domainId, id, reply, &__ctx, __del, __cookie);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceDiscovery::Callback_Lookup_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::IceDiscovery::Callback_Lookup_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(domainId, id, reply, 0, __del, __cookie);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_Lookup_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceDiscovery::Callback_Lookup_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(domainId, id, reply, &__ctx, __del, __cookie);
+        return begin_findAdapterById(__p_domainId, __p_id, __p_reply, &__ctx, __del, __cookie);
     }
 
     void end_findAdapterById(const ::Ice::AsyncResultPtr&);

data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceDiscovery/LocatorI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -99,9 +99,9 @@ ObjectRequest::runTimerTask()
     _lookup->objectRequestTimedOut(this);
 }
 
-LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrx& lookup, const Ice::PropertiesPtr& properties) : 
-    _registry(registry), 
-    _lookup(lookup), 
+LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrx& lookup, const Ice::PropertiesPtr& properties) :
+    _registry(registry),
+    _lookup(lookup),
     _timeout(IceUtil::Time::milliSeconds(properties->getPropertyAsIntWithDefault("IceDiscovery.Timeout", 300))),
     _retryCount(properties->getPropertyAsIntWithDefault("IceDiscovery.RetryCount", 3)),
     _latencyMultiplier(properties->getPropertyAsIntWithDefault("IceDiscovery.LatencyMultiplier", 1)),
@@ -138,8 +138,8 @@ LookupI::setLookupReply(const LookupReplyPrx& lookupReply)
     _lookupReply = lookupReply;
 }
 
-void 
-LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const IceDiscovery::LookupReplyPrx& reply, 
+void
+LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const IceDiscovery::LookupReplyPrx& reply,
                         const Ice::Current&)
 {
     if(domainId != _domainId)
@@ -153,12 +153,19 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
         //
         // Reply to the mulicast request using the given proxy.
         //
-        reply->begin_foundObjectById(id, proxy);
+        try
+        {
+            reply->begin_foundObjectById(id, proxy);
+        }
+        catch(const Ice::LocalException&)
+        {
+            // Ignore.
+        }
     }
 }
 
-void 
-LookupI::findAdapterById(const string& domainId, const std::string& adapterId, 
+void
+LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
                          const IceDiscovery::LookupReplyPrx& reply, const Ice::Current&)
 {
     if(domainId != _domainId)
@@ -173,15 +180,22 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
         //
         // Reply to the multicast request using the given proxy.
         //
-        reply->begin_foundAdapterById(adapterId, proxy, isReplicaGroup);
+        try
+        {
+            reply->begin_foundAdapterById(adapterId, proxy, isReplicaGroup);
+        }
+        catch(const Ice::LocalException&)
+        {
+            // Ignore.
+        }
     }
 }
 
-void 
+void
 LookupI::findObject(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::Identity& id)
 {
     Lock sync(*this);
-    map<Ice::Identity, ObjectRequestPtr>::const_iterator p = _objectRequests.find(id);
+    map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
     if(p == _objectRequests.end())
     {
         p = _objectRequests.insert(make_pair(id, new ObjectRequest(this, id, _retryCount))).first;
@@ -189,16 +203,24 @@ LookupI::findObject(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::Ide
 
     if(p->second->addCallback(cb))
     {
-        _lookup->begin_findObjectById(_domainId, id, _lookupReply);
-        _timer->schedule(p->second, _timeout);
+        try
+        {
+            _lookup->begin_findObjectById(_domainId, id, _lookupReply);
+            _timer->schedule(p->second, _timeout);
+        }
+        catch(const Ice::LocalException&)
+        {
+            p->second->finished(0);
+            _objectRequests.erase(p);
+        }
     }
 }
 
-void 
+void
 LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::string& adapterId)
 {
     Lock sync(*this);
-    map<string, AdapterRequestPtr>::const_iterator p = _adapterRequests.find(adapterId);
+    map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
     if(p == _adapterRequests.end())
     {
         p = _adapterRequests.insert(make_pair(adapterId, new AdapterRequest(this, adapterId, _retryCount))).first;
@@ -206,8 +228,16 @@ LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::s
 
     if(p->second->addCallback(cb))
     {
-        _lookup->begin_findAdapterById(_domainId, adapterId, _lookupReply);
-        _timer->schedule(p->second, _timeout);
+        try
+        {
+            _lookup->begin_findAdapterById(_domainId, adapterId, _lookupReply);
+            _timer->schedule(p->second, _timeout);
+        }
+        catch(const Ice::LocalException&)
+        {
+            p->second->finished(0);
+            _adapterRequests.erase(p);
+        }
     }
 }
 
@@ -255,15 +285,20 @@ LookupI::objectRequestTimedOut(const ObjectRequestPtr& request)
 
     if(request->retry())
     {
-        _lookup->begin_findObjectById(_domainId, request->getId(), _lookupReply);
-        _timer->schedule(p->second, _timeout);
-    }
-    else
-    {
-        request->finished(0);
-        _objectRequests.erase(p);
-        _timer->cancel(request);
+        try
+        {
+            _lookup->begin_findObjectById(_domainId, request->getId(), _lookupReply);
+            _timer->schedule(p->second, _timeout);
+            return;
+        }
+        catch(const Ice::LocalException&)
+        {
+        }
     }
+
+    request->finished(0);
+    _objectRequests.erase(p);
+    _timer->cancel(request);
 }
 
 void
@@ -278,28 +313,33 @@ LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request)
 
     if(request->retry())
     {
-        _lookup->begin_findAdapterById(_domainId, request->getId(), _lookupReply);
-        _timer->schedule(p->second, _timeout);
-    }
-    else
-    {
-        request->finished(0);
-        _adapterRequests.erase(p);
-        _timer->cancel(request);
+        try
+        {
+            _lookup->begin_findAdapterById(_domainId, request->getId(), _lookupReply);
+            _timer->schedule(p->second, _timeout);
+            return;
+        }
+        catch(const Ice::LocalException&)
+        {
+        }
     }
+
+    request->finished(0);
+    _adapterRequests.erase(p);
+    _timer->cancel(request);
 }
 
 LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup)
 {
 }
 
-void 
+void
 LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrx& proxy, const Ice::Current&)
 {
     _lookup->foundObject(id, proxy);
 }
 
-void 
+void
 LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup,
                                const Ice::Current&)
 {