summaryrefslogtreecommitdiff
path: root/csharp/src
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 /csharp/src
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 'csharp/src')
-rw-r--r--csharp/src/Ice/ACM.cs2
1 files changed, 1 insertions, 1 deletions
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;
}