summaryrefslogtreecommitdiff
path: root/cpp/lib
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-01-15 13:58:07 +0000
committerAlan Conway <aconway@apache.org>2007-01-15 13:58:07 +0000
commit722425e4d5db1e01f2d4ff2e46d03e1187da8407 (patch)
tree4b3ddc5b3ee880d2656f4ae986d0f573ba6b804e /cpp/lib
parentfe6d706ad7085de5dd0526ec0c1d7983ed61aaf3 (diff)
downloadqpid-python-722425e4d5db1e01f2d4ff2e46d03e1187da8407.tar.gz
2006-12-08 Jim Meyering <meyering@redhat.com>
Ensure that AccumulatedAck.range is not used uninitialized. * lib/broker/AccumulatedAck.h (AccumulatedAck): Make this a class, rather than a struct. (AccumulatedAck::AccumulatedAck): Add a constructor to require initialization of the "range" member. * lib/broker/BrokerChannel.cpp (Channel) [accumulatedAck]: Initialize. * tests/TxAckTest.cpp (TxAckTest) [acked]: Likewise. * tests/AccumulatedAckTest.cpp (testCovers): Initialize local. (testUpdateAndConsolidate): Likewise. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496317 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib')
-rw-r--r--cpp/lib/broker/AccumulatedAck.h4
-rw-r--r--cpp/lib/broker/BrokerChannel.cpp1
2 files changed, 4 insertions, 1 deletions
diff --git a/cpp/lib/broker/AccumulatedAck.h b/cpp/lib/broker/AccumulatedAck.h
index 055c8ea3e0..c472f7f3ea 100644
--- a/cpp/lib/broker/AccumulatedAck.h
+++ b/cpp/lib/broker/AccumulatedAck.h
@@ -31,7 +31,8 @@ namespace qpid {
* Keeps an accumulated record of acked messages (by delivery
* tag).
*/
- struct AccumulatedAck{
+ class AccumulatedAck {
+ public:
/**
* If not zero, then everything up to this value has been
* acked.
@@ -43,6 +44,7 @@ namespace qpid {
*/
std::list<u_int64_t> individual;
+ AccumulatedAck(u_int64_t r) : range(r) {}
void update(u_int64_t tag, bool multiple);
void consolidate();
void clear();
diff --git a/cpp/lib/broker/BrokerChannel.cpp b/cpp/lib/broker/BrokerChannel.cpp
index f569872770..65aa50d3ac 100644
--- a/cpp/lib/broker/BrokerChannel.cpp
+++ b/cpp/lib/broker/BrokerChannel.cpp
@@ -40,6 +40,7 @@ Channel::Channel(qpid::framing::ProtocolVersion& _version, OutputHandler* _out,
prefetchCount(0),
framesize(_framesize),
tagGenerator("sgen"),
+ accumulatedAck(0),
store(_store),
messageBuilder(this, _store, _stagingThreshold),
version(_version){