Author: astitcher
Date: Wed Feb 7 08:15:58 2007
New Revision: 504603
URL: http://svn.apache.org/viewvc?view=rev&rev=504603
Log:
[EMAIL PROTECTED]: andrew | 2007-01-19 00:31:59 +0000
Fixed merge errors
[EMAIL PROTECTED]: andrew | 2007-01-19 00:47:29 +0000
Another merge problem fixed
[EMAIL PROTECTED]: andrew | 2007-01-24 11:27:48 +0000
Started work on the Message class handler implementation
[EMAIL PROTECTED]: andrew | 2007-01-30 17:05:05 +0000
Working again after broker Message refactor
[EMAIL PROTECTED]: andrew | 2007-01-30 18:39:18 +0000
Fix for extra parameter to transfer
[EMAIL PROTECTED]: andrew | 2007-01-31 18:29:57 +0000
Checkpoint of work on broker MessageMessage
[EMAIL PROTECTED]: andrew | 2007-01-31 22:02:27 +0000
MessageMessage work now compiles
[EMAIL PROTECTED]: 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.
[EMAIL PROTECTED]: andrew | 2007-02-06 14:53:22 +0000
Fixed broken push
[EMAIL PROTECTED]: andrew | 2007-02-06 15:48:20 +0000
Merge fixes
[EMAIL PROTECTED]: andrew | 2007-02-07 16:15:27 +0000
Implement contentSize for inline content
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerMessageMessage.cpp
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 7 08:15:58 2007
@@ -1 +1 @@
-8427bd24-ae5a-4eba-a324-d2fc9c9c6c77:/local/qpid.0-9.ams:839
+8427bd24-ae5a-4eba-a324-d2fc9c9c6c77:/local/qpid.0-9.ams:1091
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerMessageMessage.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerMessageMessage.cpp?view=diff&rev=504603&r1=504602&r2=504603
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerMessageMessage.cpp
(original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerMessageMessage.cpp
Wed Feb 7 08:15:58 2007
@@ -94,8 +94,11 @@
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()
