summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClifford Jansen <cliffjansen@apache.org = cliffjansen = Clifford Jansen cliffjansen@apache.org@apache.org>2014-04-15 06:21:51 +0000
committerClifford Jansen <cliffjansen@apache.org = cliffjansen = Clifford Jansen cliffjansen@apache.org@apache.org>2014-04-15 06:21:51 +0000
commitf89c7cbe3befa29c899af3765ceaf9c1f93ecd18 (patch)
treee15a2e31f3ce832841a26c75aaf0b451de2b7afb
parent19dd651471d9318b3b3c64006f0b130b6827780e (diff)
downloadqpid-python-f89c7cbe3befa29c899af3765ceaf9c1f93ecd18.tar.gz
QPID-5694: Windows C++ broker SSL: do not send non-existent negotiation token on shutdown
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587446 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
index cd50be4971..28abc743f4 100644
--- a/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
@@ -661,7 +661,7 @@ void ServerSslAsynchIO::negotiateStep(BufferBase* buff) {
return;
}
// There may have been a token generated; if so, send it to the client.
- if (sendBuffs[0].cbBuffer > 0) {
+ if (sendBuffs[0].cbBuffer > 0 && state != ShuttingDown) {
sendbuff->dataCount = sendBuffs[0].cbBuffer;
aio->queueWrite(sendbuff);
}