summaryrefslogtreecommitdiff
path: root/csharp/src/Ice/ConnectionFactory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/src/Ice/ConnectionFactory.cs')
-rw-r--r--csharp/src/Ice/ConnectionFactory.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/csharp/src/Ice/ConnectionFactory.cs b/csharp/src/Ice/ConnectionFactory.cs
index fdfe0485537..ce7941142d5 100644
--- a/csharp/src/Ice/ConnectionFactory.cs
+++ b/csharp/src/Ice/ConnectionFactory.cs
@@ -1513,8 +1513,10 @@ namespace IceInternal
_instance.timer().schedule(new StartAcceptor(this), 1000);
return;
}
- Debug.Assert(_state == StateClosed);
- setState(StateFinished);
+ else if(_state == StateClosed)
+ {
+ setState(StateFinished);
+ }
}
}
@@ -1711,15 +1713,11 @@ namespace IceInternal
case StateClosed:
{
+ _adapter.getThreadPool().finish(this);
if(_acceptorStarted)
{
- _adapter.getThreadPool().finish(this);
closeAcceptor();
}
- else
- {
- state = StateFinished;
- }
foreach(Ice.ConnectionI connection in _connections)
{