summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-07-16 16:08:57 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-07-16 16:08:57 -0230
commit77252831908da8f92fe4d81bcd3862aadafb6702 (patch)
treeb2edace8ecdffac184c0373ba69e9fec602d0821 /java/src
parentMinor fix to library Demo: (diff)
downloadice-77252831908da8f92fe4d81bcd3862aadafb6702.tar.bz2
ice-77252831908da8f92fe4d81bcd3862aadafb6702.tar.xz
ice-77252831908da8f92fe4d81bcd3862aadafb6702.zip
Fix bug with connection closure causing hang in C# async demo with
COMPACT defined.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/ConnectionI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index 70fed8c7ec7..fd8a387a52d 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -2419,7 +2419,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
// If all the messages were sent and we are in the closing state, we schedule
// the close timeout to wait for the peer to close the connection.
//
- if(_state == StateClosing)
+ if(_state == StateClosing && _dispatchCount == 0)
{
setState(StateClosingPending);
int op = _transceiver.closing(true, _exception);