summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Instance.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-08-01 15:46:23 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-08-01 15:46:23 +0200
commitd63daa520a5fc99cf7acbae17767bc0776d6ba5b (patch)
tree558969644df7f03c96ebdcf2effc83a1145061bb /java/src/IceInternal/Instance.java
parentFixed GCObject code-style issues (diff)
downloadice-d63daa520a5fc99cf7acbae17767bc0776d6ba5b.tar.bz2
ice-d63daa520a5fc99cf7acbae17767bc0776d6ba5b.tar.xz
ice-d63daa520a5fc99cf7acbae17767bc0776d6ba5b.zip
Fixed leak when observer updater is installed, code-style issues
Diffstat (limited to 'java/src/IceInternal/Instance.java')
-rw-r--r--java/src/IceInternal/Instance.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 824ac9c4ba4..95f8d33481e 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -1037,6 +1037,11 @@ public final class Instance
_retryQueue.destroy();
}
+ if(_observer != null)
+ {
+ _observer.setObserverUpdater(null);
+ }
+
ThreadPool serverThreadPool = null;
ThreadPool clientThreadPool = null;
EndpointHostResolver endpointHostResolver = null;