summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2014-11-20 21:50:23 +0000
committerGordon Sim <gsim@apache.org>2014-11-20 21:50:23 +0000
commit897fad08d8eb23c002a14760749ae74e6dfdb73f (patch)
tree2d1a85db11536c5e0d675dadc1a49db31a9a8fa1 /qpid/cpp
parent5d4c5f8b7a42ff9ab117be2c56a1e33b7165e8f4 (diff)
downloadqpid-python-897fad08d8eb23c002a14760749ae74e6dfdb73f.tar.gz
QPID-4710: fix decoding of transtional outcome
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1640826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Session.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
index 7f4790fa96..dc7f2695c2 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
@@ -752,7 +752,9 @@ std::pair<TxBuffer*,uint64_t> Session::getTransactionalState(pn_delivery_t* deli
if (!result.first) {
QPID_LOG(error, "Transaction not found for id: " << id);
}
- if (count > 1 && pn_data_next(data)) {
+ if (count > 1 && pn_data_next(data) && pn_data_is_described(data)) {
+ pn_data_enter(data);
+ pn_data_next(data);
result.second = pn_data_get_ulong(data);
}
pn_data_exit(data);