diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-21 14:57:38 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-21 14:57:38 +0000 |
| commit | 8acfe1f3c4945ba9411d4cf4f9657b5b26738cf7 (patch) | |
| tree | 271260bc1ea9b34cdaed3b8182f61ae91801ddcb /java/src/IceInternal/ServantManager.java | |
| parent | Fix for bug #1112 (diff) | |
| download | ice-8acfe1f3c4945ba9411d4cf4f9657b5b26738cf7.tar.bz2 ice-8acfe1f3c4945ba9411d4cf4f9657b5b26738cf7.tar.xz ice-8acfe1f3c4945ba9411d4cf4f9657b5b26738cf7.zip | |
Fixed bug 1104
Diffstat (limited to 'java/src/IceInternal/ServantManager.java')
| -rw-r--r-- | java/src/IceInternal/ServantManager.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index 948365dc709..5a48fdc96cd 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -98,7 +98,13 @@ public final class ServantManager public synchronized Ice.Object findServant(Ice.Identity ident, String facet) { - assert(_instance != null); // Must not be called after destruction. + // + // This assert is not valid if the adapter dispatch incoming + // requests from bidir connections. This method might be called if + // requests are received over the bidir connection after the + // adapter was deactivated. + // + //assert(_instance != null); // Must not be called after destruction. if(facet == null) { @@ -132,7 +138,13 @@ public final class ServantManager public synchronized boolean hasServant(Ice.Identity ident) { - assert(_instance != null); // Must not be called after destruction. + // + // This assert is not valid if the adapter dispatch incoming + // requests from bidir connections. This method might be called if + // requests are received over the bidir connection after the + // adapter was deactivated. + // + //assert(_instance != null); // Must not be called after destruction. java.util.HashMap m = (java.util.HashMap)_servantMapMap.get(ident); if(m == null) @@ -166,7 +178,13 @@ public final class ServantManager public synchronized Ice.ServantLocator findServantLocator(String category) { - assert(_instance != null); // Must not be called after destruction. + // + // This assert is not valid if the adapter dispatch incoming + // requests from bidir connections. This method might be called if + // requests are received over the bidir connection after the + // adapter was deactivated. + // + //assert(_instance != null); // Must not be called after destruction. return (Ice.ServantLocator)_locatorMap.get(category); } |