diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-09-27 14:51:32 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-09-27 14:51:32 +0000 |
| commit | 26ca63d99b5d771ba3da00707c78f87157d29f13 (patch) | |
| tree | 55db72fe1ee5ca3348bdf3d16bffb54385c5a953 /java/src | |
| parent | Win32 fixes (diff) | |
| download | ice-26ca63d99b5d771ba3da00707c78f87157d29f13.tar.bz2 ice-26ca63d99b5d771ba3da00707c78f87157d29f13.tar.xz ice-26ca63d99b5d771ba3da00707c78f87157d29f13.zip | |
Fixed bug 495 - assertion on server side udp shutdown
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/IncomingConnectionFactory.java | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index f92f0bc6c6f..8a99d371cd7 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -531,24 +531,27 @@ public final class IncomingConnectionFactory extends EventHandler case StateClosed: { - if(_instance.threadPerConnection() && _acceptor != null) + if(_acceptor != null) { - // - // If we are in thread per connection mode, we connect - // to our own acceptor, which unblocks our thread per - // incoming connection factory stuck in accept(). - // - _acceptor.connectToSelf(); - } - else - { - // - // Otherwise we first must make sure that we are - // registered, then we unregister, and let finished() - // do the close. - // - registerWithPool(); - unregisterWithPool(); + if(_instance.threadPerConnection()) + { + // + // If we are in thread per connection mode, we connect + // to our own acceptor, which unblocks our thread per + // incoming connection factory stuck in accept(). + // + _acceptor.connectToSelf(); + } + else + { + // + // Otherwise we first must make sure that we are + // registered, then we unregister, and let finished() + // do the close. + // + registerWithPool(); + unregisterWithPool(); + } } java.util.ListIterator p = _connections.listIterator(); |