diff options
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
| -rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index a99b3556b73..afc0d5120ea 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -350,7 +350,11 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt public synchronized ServantLocator findServantLocator(String prefix) { - checkForDeactivation(); + // + // We cannot check for deactivation here, because after + // deactivation, there might still be some Incoming objects. + // + //checkForDeactivation(); return (ServantLocator)_locatorMap.get(prefix); } @@ -358,7 +362,11 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt public synchronized Ice.Object identityToServant(Identity ident) { - checkForDeactivation(); + // + // We cannot check for deactivation here, because after + // deactivation, there might still be some Incoming objects. + // + //checkForDeactivation(); // // Don't call checkIdentity. We simply want null to be |