diff options
| author | Alan Conway <aconway@apache.org> | 2007-09-18 19:43:29 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-09-18 19:43:29 +0000 |
| commit | 6aeb03f0f5ac7ede957995fc784367a30920c683 (patch) | |
| tree | 7fe35f0ce9fe6bf17dbd6416deb6069ef9c7b07c /cpp/src/qpid/broker/Message.cpp | |
| parent | 8b039e1ed4e4340917d7fd3d8202049e691ca6ec (diff) | |
| download | qpid-python-6aeb03f0f5ac7ede957995fc784367a30920c683.tar.gz | |
Refactor HandlerImpl to use Session rather than CoreRefs.
Remove most uses of ChannelAdapter in broker code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@577027 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Message.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Message.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp index 39f9f85c13..f0cbf027df 100644 --- a/cpp/src/qpid/broker/Message.cpp +++ b/cpp/src/qpid/broker/Message.cpp @@ -139,7 +139,7 @@ void Message::releaseContent(MessageStore* _store) frames.remove(TypeFilter(CONTENT_BODY)); } -void Message::sendContent(framing::FrameHandler& out, uint16_t channel, uint16_t maxFrameSize) +void Message::sendContent(framing::FrameHandler& out, uint16_t maxFrameSize) { if (isContentReleased()) { //load content from store in chunks of maxContentSize @@ -148,7 +148,7 @@ void Message::sendContent(framing::FrameHandler& out, uint16_t channel, uint16_t for (uint64_t offset = 0; offset < expectedSize; offset += maxContentSize) { uint64_t remaining = expectedSize - offset; - AMQFrame frame(channel, AMQContentBody()); + AMQFrame frame(0, AMQContentBody()); string& data = frame.castBody<AMQContentBody>()->getData(); store->loadContent(*this, data, offset, @@ -168,15 +168,14 @@ void Message::sendContent(framing::FrameHandler& out, uint16_t channel, uint16_t Count c; frames.map_if(c, TypeFilter(CONTENT_BODY)); - SendContent f(out, channel, maxFrameSize, c.getCount()); + SendContent f(out, maxFrameSize, c.getCount()); frames.map_if(f, TypeFilter(CONTENT_BODY)); } } -void Message::sendHeader(framing::FrameHandler& out, uint16_t channel, uint16_t /*maxFrameSize*/) +void Message::sendHeader(framing::FrameHandler& out, uint16_t /*maxFrameSize*/) { - Relay f(out, channel); - frames.map_if(f, TypeFilter(HEADER_BODY)); + frames.map_if(out, TypeFilter(HEADER_BODY)); } MessageAdapter& Message::getAdapter() const |