From 380e5b0d75fa8b4a663e39cfed69f81a10ec5980 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 19 Jan 2007 09:37:56 +0000 Subject: * tests/FramingTest.cpp - added test for validation of content data type * lib/broker/BrokerAdapter.cpp - initial unbind implementation * lib/common/framing/FramingContent.cpp - minor code cleanup git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@497755 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/common/framing/FramingContent.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'cpp/lib/common') diff --git a/cpp/lib/common/framing/FramingContent.cpp b/cpp/lib/common/framing/FramingContent.cpp index bf3399525e..45335ba9c9 100644 --- a/cpp/lib/common/framing/FramingContent.cpp +++ b/cpp/lib/common/framing/FramingContent.cpp @@ -35,16 +35,13 @@ Content::Content(u_int8_t _discriminator, const string& _value): discriminator(_ } void Content::validate() { - //validation: if (discriminator == REFERENCE) { if(value.empty()) { - //cannot have empty reference THROW_QPID_ERROR(FRAMING_ERROR, "Reference cannot be empty"); } }else if (discriminator != INLINE) { - //invalid discriminator std::stringstream out; - out << "Invalid discriminator: " << discriminator; + out << "Invalid discriminator: " << (int) discriminator; THROW_QPID_ERROR(FRAMING_ERROR, out.str()); } } @@ -63,7 +60,7 @@ void Content::decode(Buffer& buffer) { } size_t Content::size() const { - return 1 + 4 + value.size(); + return 1/*discriminator*/ + 4/*for recording size of long string*/ + value.size(); } std::ostream& operator<<(std::ostream& out, const Content& content) { -- cgit v1.2.1