From 6fa7f890771e00178380a2e0fdec1eb066acc90d Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 7 Feb 2007 16:15:58 +0000 Subject: r840@fuschia: andrew | 2007-01-19 00:31:59 +0000 Fixed merge errors r841@fuschia: andrew | 2007-01-19 00:47:29 +0000 Another merge problem fixed r878@fuschia: andrew | 2007-01-24 11:27:48 +0000 Started work on the Message class handler implementation r976@fuschia: andrew | 2007-01-30 17:05:05 +0000 Working again after broker Message refactor r980@fuschia: andrew | 2007-01-30 18:39:18 +0000 Fix for extra parameter to transfer r992@fuschia: andrew | 2007-01-31 18:29:57 +0000 Checkpoint of work on broker MessageMessage r1001@fuschia: andrew | 2007-01-31 22:02:27 +0000 MessageMessage work now compiles r1071@fuschia: andrew | 2007-02-06 14:14:30 +0000 Implemented outgoing Message.Transfer so that messages are now delivered - Still to do: correctly process the Message.Ok acknowledgements; Message.Get etc. r1081@fuschia: andrew | 2007-02-06 14:53:22 +0000 Fixed broken push r1084@fuschia: andrew | 2007-02-06 15:48:20 +0000 Merge fixes r1091@fuschia: andrew | 2007-02-07 16:15:27 +0000 Implement contentSize for inline content git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@504603 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/broker/BrokerMessageMessage.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cpp/lib') diff --git a/cpp/lib/broker/BrokerMessageMessage.cpp b/cpp/lib/broker/BrokerMessageMessage.cpp index 29186cc18e..153acb9ab5 100644 --- a/cpp/lib/broker/BrokerMessageMessage.cpp +++ b/cpp/lib/broker/BrokerMessageMessage.cpp @@ -94,8 +94,11 @@ bool MessageMessage::isComplete() u_int64_t MessageMessage::contentSize() const { - THROW_QPID_ERROR(INTERNAL_ERROR, "Unfinished"); - return 0; // FIXME aconway 2007-02-05: + // FIXME astitcher 2007-2-7 only works for inline content + if (transfer->getBody().isInline()) + return transfer->getBody().size(); + else + THROW_QPID_ERROR(INTERNAL_ERROR, "Unfinished"); } qpid::framing::BasicHeaderProperties* MessageMessage::getHeaderProperties() -- cgit v1.2.1