summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
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 /cpp/src/Ice/ConnectionI.cpp
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 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index ffeb9d80369..1cae69bc9eb 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -2851,7 +2851,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks)
// 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);
SocketOperation op = _transceiver->closing(true, *_exception.get());