summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-13 11:10:33 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-13 11:10:33 +0200
commit25daee96ab3b986711db0cee5d1d61a3dc1907cc (patch)
tree6a5bb92effa70c227880bb590f8ace0bda707ead /js
parentUpdate assembley strog name public key token (diff)
downloadice-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 'js')
-rw-r--r--js/src/Ice/ACM.js3
1 files changed, 1 insertions, 2 deletions
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