diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2007-01-09 20:29:06 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2007-01-09 20:29:06 +0000 |
| commit | f420415a0fd5ab9f536d38aa6ec6bd4580b45e30 (patch) | |
| tree | 2889ea8ccb36409d52c4c927050869e58eb94c3c /cpp/lib/broker/BrokerMessage.cpp | |
| parent | 34ba05808a60710ec97abf82620074c6b40fe1d4 (diff) | |
| download | qpid-python-f420415a0fd5ab9f536d38aa6ec6bd4580b45e30.tar.gz | |
version back merge from trunk rev 494553.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@494559 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/broker/BrokerMessage.cpp')
| -rw-r--r-- | cpp/lib/broker/BrokerMessage.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/lib/broker/BrokerMessage.cpp b/cpp/lib/broker/BrokerMessage.cpp index 7fef77e1ff..6ba2131a74 100644 --- a/cpp/lib/broker/BrokerMessage.cpp +++ b/cpp/lib/broker/BrokerMessage.cpp @@ -80,8 +80,8 @@ void Message::deliver(OutputHandler* out, int channel, u_int32_t framesize, ProtocolVersion* version){ // CCT -- TODO - Update code generator to take pointer/ not instance to avoid extra contruction - out->send(new AMQFrame(channel, new BasicDeliverBody(*version, consumerTag, deliveryTag, redelivered, exchange, routingKey))); - sendContent(out, channel, framesize); + out->send(new AMQFrame(*version, channel, new BasicDeliverBody(*version, consumerTag, deliveryTag, redelivered, exchange, routingKey))); + sendContent(out, channel, framesize, version); } void Message::sendGetOk(OutputHandler* out, @@ -91,16 +91,16 @@ void Message::sendGetOk(OutputHandler* out, u_int32_t framesize, ProtocolVersion* version){ // CCT -- TODO - Update code generator to take pointer/ not instance to avoid extra contruction - out->send(new AMQFrame(channel, new BasicGetOkBody(*version, deliveryTag, redelivered, exchange, routingKey, messageCount))); - sendContent(out, channel, framesize); + out->send(new AMQFrame(*version, channel, new BasicGetOkBody(*version, deliveryTag, redelivered, exchange, routingKey, messageCount))); + sendContent(out, channel, framesize, version); } -void Message::sendContent(OutputHandler* out, int channel, u_int32_t framesize){ +void Message::sendContent(OutputHandler* out, int channel, u_int32_t framesize, ProtocolVersion* version){ AMQBody::shared_ptr headerBody = static_pointer_cast<AMQBody, AMQHeaderBody>(header); - out->send(new AMQFrame(channel, headerBody)); + out->send(new AMQFrame(*version, channel, headerBody)); Mutex::ScopedLock locker(contentLock); - if (content.get()) content->send(out, channel, framesize); + if (content.get()) content->send(*version, out, channel, framesize); } BasicHeaderProperties* Message::getHeaderProperties(){ |