summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/LocatorI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/LocatorI.cpp')
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index ee19b2c19f1..bcc2a893df7 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -310,6 +310,15 @@ LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb,
}
//
+ // If the proxy is 0, this means that the object is allocatable.
+ //
+ if(!proxy)
+ {
+ cb->ice_response(0);
+ return;
+ }
+
+ //
// OPTIMIZATION: If the object is registered with an adapter id,
// try to get the adapter direct proxy (which might caused the
// server activation). This will avoid the client to lookup for