diff options
| -rw-r--r-- | cpp/src/Ice/ACM.cpp | 2 | ||||
| -rw-r--r-- | csharp/src/Ice/ACM.cs | 2 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java | 2 | ||||
| -rw-r--r-- | js/src/Ice/ACM.js | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index 238791edfa1..9392df6aacc 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -95,7 +95,6 @@ IceInternal::FactoryACMMonitor::destroy() } _instance = 0; - _connections.clear(); _changes.clear(); } @@ -187,6 +186,7 @@ IceInternal::FactoryACMMonitor::runTimerTask() Lock sync(*this); if(!_instance) { + _connections.clear(); return; } diff --git a/csharp/src/Ice/ACM.cs b/csharp/src/Ice/ACM.cs index 6eef3867299..b8af4ddff49 100644 --- a/csharp/src/Ice/ACM.cs +++ b/csharp/src/Ice/ACM.cs @@ -112,7 +112,6 @@ namespace IceInternal return; } _instance = null; - _connections.Clear(); _changes.Clear(); } } @@ -209,6 +208,7 @@ namespace IceInternal { if(_instance == null) { + _connections.Clear(); return; } 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; } diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java index d952e567fea..ba3a1b3c884 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java @@ -58,7 +58,6 @@ class FactoryACMMonitor implements ACMMonitor return; } _instance = null; - _connections.clear(); _changes.clear(); } @@ -165,6 +164,7 @@ class FactoryACMMonitor implements ACMMonitor { if(_instance == null) { + _connections.clear(); return; } diff --git a/js/src/Ice/ACM.js b/js/src/Ice/ACM.js index 64f5e86df3f..e22fd40aa91 100644 --- a/js/src/Ice/ACM.js +++ b/js/src/Ice/ACM.js @@ -80,7 +80,6 @@ class FactoryACMMonitor return; } this._instance = null; - this._connections = null; } add(connection) @@ -162,6 +161,7 @@ class FactoryACMMonitor { if(this._instance === null) { + this._connections = null; return; } @@ -170,7 +170,6 @@ class FactoryACMMonitor // that connections can be added or removed during monitoring. // let now = Date.now(); - this._connections.forEach(connection => { try |