summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-11-11 21:09:21 +0000
committerAlan Conway <aconway@apache.org>2008-11-11 21:09:21 +0000
commit5c2c542b044a0cc661c2fe435103fe25db1b6da5 (patch)
treeac488c4b4048516d72f5555bcbc5803121ae2c78 /cpp/src/qpid/broker
parentce71dffee41acc012536afa37465cfac214d5439 (diff)
downloadqpid-python-5c2c542b044a0cc661c2fe435103fe25db1b6da5.tar.gz
Include DeliveryRecord::credit in replication to new members.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@713171 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker')
-rw-r--r--cpp/src/qpid/broker/DeliveryRecord.cpp5
-rw-r--r--cpp/src/qpid/broker/DeliveryRecord.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp
index 900016d381..e68cc79d8b 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/cpp/src/qpid/broker/DeliveryRecord.cpp
@@ -35,7 +35,8 @@ DeliveryRecord::DeliveryRecord(const QueuedMessage& _msg,
const std::string& _tag,
bool _acquired,
bool accepted,
- bool _windowing) : msg(_msg),
+ bool _windowing,
+ uint32_t _credit) : msg(_msg),
queue(_queue),
tag(_tag),
acquired(_acquired),
@@ -44,7 +45,7 @@ DeliveryRecord::DeliveryRecord(const QueuedMessage& _msg,
completed(false),
ended(accepted),
windowing(_windowing),
- credit(msg.payload ? msg.payload->getRequiredCredit() : 0)
+ credit(msg.payload ? msg.payload->getRequiredCredit() : _credit)
{}
void DeliveryRecord::setEnded()
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/cpp/src/qpid/broker/DeliveryRecord.h
index 952e888c03..4b372b2cfa 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/cpp/src/qpid/broker/DeliveryRecord.h
@@ -80,7 +80,8 @@ class DeliveryRecord
const std::string& tag,
bool acquired,
bool accepted,
- bool windowing
+ bool windowing,
+ uint32_t credit=0 // Only used if msg is empty.
);
bool matches(DeliveryId tag) const;