diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-12 15:18:23 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-12 15:18:46 +0100 |
| commit | 5408915d05a37af5a74d67a585e6acff3bb996e4 (patch) | |
| tree | 13bcc9fbf9844910bf80718f4aa9fb272af18d6f /csharp/src/Ice/ConnectionFactory.cs | |
| parent | Add support to build PHP NuGet packages (diff) | |
| download | ice-5408915d05a37af5a74d67a585e6acff3bb996e4.tar.bz2 ice-5408915d05a37af5a74d67a585e6acff3bb996e4.tar.xz ice-5408915d05a37af5a74d67a585e6acff3bb996e4.zip | |
Another fix for the assert which could be triggered on OA destruction, fixes #291
Diffstat (limited to 'csharp/src/Ice/ConnectionFactory.cs')
| -rw-r--r-- | csharp/src/Ice/ConnectionFactory.cs | 12 |
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) { |