summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-06-10 15:12:02 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-06-10 15:12:02 +0200
commite709d99c6e3b67947e545bab7ef760cf1e1cdf0f (patch)
treecf7d462ca2d441f88890a310d51da149687e4f5e /java/src
parentFix TestUtil.py status code handling (diff)
downloadice-e709d99c6e3b67947e545bab7ef760cf1e1cdf0f.tar.bz2
ice-e709d99c6e3b67947e545bab7ef760cf1e1cdf0f.tar.xz
ice-e709d99c6e3b67947e545bab7ef760cf1e1cdf0f.zip
Fixed bug in object adapter where default servants were not cleared on destroyed (ICE-6582)
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/src/main/java/IceInternal/ServantManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/ServantManager.java b/java/src/Ice/src/main/java/IceInternal/ServantManager.java
index daa4f6bb9d1..a9af98da2b4 100644
--- a/java/src/Ice/src/main/java/IceInternal/ServantManager.java
+++ b/java/src/Ice/src/main/java/IceInternal/ServantManager.java
@@ -286,10 +286,14 @@ public final class ServantManager
}
logger = _instance.initializationData().logger;
+
_servantMapMap.clear();
+ _defaultServantMap.clear();
+
locatorMap.putAll(_locatorMap);
_locatorMap.clear();
+
_instance = null;
}