summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2016-05-23 13:20:01 +0000
committerGordon Sim <gsim@apache.org>2016-05-23 13:20:01 +0000
commitedee47f4d91d218b6076560936bb579b893cc9b8 (patch)
treebab3e3406b4c09d29f393b559a4c4374876fa5f0 /qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
parentec42d9558d8714b22b356358437556cae8130815 (diff)
downloadqpid-python-edee47f4d91d218b6076560936bb579b893cc9b8.tar.gz
QPID-7234: check handler is not null (as it will be when releasing unused prefetch on close)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1745195 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp')
-rw-r--r--qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index 490ad91bfb..a105a67b3f 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
@@ -284,7 +284,7 @@ IncomingMessages::ProcessState IncomingMessages::process(Handler* handler, qpid:
for (Duration timeout = duration; pop(content, timeout); timeout = Duration(AbsTime::now(), deadline)) {
if (content->isA<MessageTransferBody>()) {
MessageTransfer transfer(content, *this);
- if (transfer.checkExpired() && handler->expire(transfer)) {
+ if (handler && transfer.checkExpired() && handler->expire(transfer)) {
QPID_LOG(debug, "Expired received transfer: " << *content->getMethod());
} else if (handler && handler->accept(transfer)) {
QPID_LOG(debug, "Delivered " << *content->getMethod() << " "