diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-13 11:10:33 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-13 11:10:33 +0200 |
| commit | 25daee96ab3b986711db0cee5d1d61a3dc1907cc (patch) | |
| tree | 6a5bb92effa70c227880bb590f8ace0bda707ead /java-compat/src | |
| parent | Update assembley strog name public key token (diff) | |
| download | ice-25daee96ab3b986711db0cee5d1d61a3dc1907cc.tar.bz2 ice-25daee96ab3b986711db0cee5d1d61a3dc1907cc.tar.xz ice-25daee96ab3b986711db0cee5d1d61a3dc1907cc.zip | |
Fix for ICE-8015 - clear ACM monitor connections from the timer thread
Diffstat (limited to 'java-compat/src')
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java index f9ebb993713..79cb7b200ef 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java @@ -58,7 +58,6 @@ class FactoryACMMonitor implements ACMMonitor return; } _instance = null; - _connections.clear(); _changes.clear(); } @@ -168,6 +167,7 @@ class FactoryACMMonitor implements ACMMonitor { if(_instance == null) { + _connections.clear(); return; } |