diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-12-11 11:37:06 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-12-11 11:37:06 +0100 |
| commit | 8e5efa50aa788e3680a07cc02f0d2d522d98f03b (patch) | |
| tree | 93874bc2d813a172d5bba342a8654fab55a3fc9e | |
| parent | Disable FD limit testing on Android, potential fix for #315 (diff) | |
| download | ice-8e5efa50aa788e3680a07cc02f0d2d522d98f03b.tar.bz2 ice-8e5efa50aa788e3680a07cc02f0d2d522d98f03b.tar.xz ice-8e5efa50aa788e3680a07cc02f0d2d522d98f03b.zip | |
Fixed bogus incoming connection factory assert, fixes #301
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 41c7dd448c6..d57359cfd72 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1606,7 +1606,7 @@ IceInternal::IncomingConnectionFactory::finished(ThreadPoolCurrent&, bool close) return; } - assert(_state == StateClosed); + assert(_state >= StateClosed); setState(StateFinished); if(close) diff --git a/csharp/src/Ice/ConnectionFactory.cs b/csharp/src/Ice/ConnectionFactory.cs index 786d031e24d..f252d10dbb6 100644 --- a/csharp/src/Ice/ConnectionFactory.cs +++ b/csharp/src/Ice/ConnectionFactory.cs @@ -1521,7 +1521,7 @@ namespace IceInternal return; } - Debug.Assert(_state == StateClosed); + Debug.Assert(_state >= StateClosed); setState(StateFinished); } } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java index aa3ed035f46..f49d7e8c82f 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java @@ -390,7 +390,7 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice return; } - assert(_state == StateClosed); + assert(_state >= StateClosed); setState(StateFinished); if(close) diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java index 88013d9bd62..6fdd69f2b21 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java @@ -380,7 +380,7 @@ public final class IncomingConnectionFactory extends EventHandler implements Con return; } - assert(_state == StateClosed); + assert(_state >= StateClosed); setState(StateFinished); if(close) |