diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-10-02 16:45:39 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-10-02 16:45:39 -0230 |
| commit | 4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291 (patch) | |
| tree | 2d9c1f2761bdfc78526d2cabbca9c9d5f445a3bd /java/src/IceInternal/ServantManager.java | |
| parent | ICE-5585 call callback from ThreadPool if conneciton already closed (diff) | |
| download | ice-4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291.tar.bz2 ice-4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291.tar.xz ice-4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291.zip | |
Cleanup and simplification of OA in C++/Java/C#.
Diffstat (limited to 'java/src/IceInternal/ServantManager.java')
| -rw-r--r-- | java/src/IceInternal/ServantManager.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index 0b188525d70..6089a56caf1 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -277,7 +277,14 @@ public final class ServantManager Ice.Logger logger = null; synchronized(this) { - assert(_instance != null); // Must not be called after destruction. + // + // If the ServantManager has already been destroyed, we're done. + // + if(_instance == null) + { + return; + } + logger = _instance.initializationData().logger; _servantMapMap.clear(); |