diff options
author | Alan Conway <aconway@apache.org> | 2016-04-05 21:50:04 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2016-04-05 21:50:04 +0000 |
commit | eb1e7851a50c6a7901c73eb42d639516c0e3ba43 (patch) | |
tree | 509c001a09e2b9fecaba5597fa41869f5fe7a4b1 /qpid/cpp/src/qpid/ha/StatusCheck.cpp | |
parent | c9f1b7641fa089eca017a543991485be5de35775 (diff) | |
download | qpid-python-eb1e7851a50c6a7901c73eb42d639516c0e3ba43.tar.gz |
QPID-7149: Fixed messaging client shutdown.
Fix previous commit that did not respect the plugin boundaries for
messaging::shutdown.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1737887 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/StatusCheck.cpp')
-rw-r--r-- | qpid/cpp/src/qpid/ha/StatusCheck.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/ha/StatusCheck.cpp b/qpid/cpp/src/qpid/ha/StatusCheck.cpp index b6bce0fd7b..e1c8df5e56 100644 --- a/qpid/cpp/src/qpid/ha/StatusCheck.cpp +++ b/qpid/cpp/src/qpid/ha/StatusCheck.cpp @@ -23,13 +23,13 @@ #include "HaBroker.h" #include "qpid/broker/Broker.h" #include "qpid/log/Statement.h" -#include "qpid/messaging/shutdown.h" #include "qpid/messaging/Address.h" #include "qpid/messaging/Connection.h" #include "qpid/messaging/Message.h" #include "qpid/messaging/Receiver.h" #include "qpid/messaging/Sender.h" #include "qpid/messaging/Session.h" +#include "qpid/messaging/ProtocolRegistry.h" #include "qpid/types/Variant.h" namespace qpid { @@ -136,7 +136,7 @@ void StatusCheck::endThread() { // Shut down the client poller ASAP to avoid conflict with the broker's poller. // See https://issues.apache.org/jira/browse/QPID-7149 if (--threadCount == 0) { - messaging::shutdown(); + messaging::ProtocolRegistry::shutdown(); } } |