From f61e1ef7589da893b9b54448224dc0961515eb40 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 26 Oct 2007 19:48:31 +0000 Subject: Session resume support in client & broker: Client can resume a session after voluntary suspend() or network failure. Frames lost in network failure are automatically re-transmitted for transparent re-connection. client::Session improvements: - Locking to avoid races between network & user threads. - Replaced client::StateManager with sys::StateMonitor - avoid heap allocation. qpid::Exception clean up: - use QPID_MSG consistently to format exception messages. - throw typed exceptions (in reply_exceptions.h) for AMQP exceptions. - re-throw correct typed exception on client for exceptions from broker. - Removed QpidError.h rubygen/templates/constants.rb: - constants.h: Added FOO_CLASS_ID and FOO_BAR_METHOD_ID constants. - reply_constants.h: Added throwReplyException(code, text) log::Logger: - Fixed shutdown race in Statement::~Initializer() git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@588761 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/framing/FramingContent.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'cpp/src/qpid/framing/FramingContent.cpp') diff --git a/cpp/src/qpid/framing/FramingContent.cpp b/cpp/src/qpid/framing/FramingContent.cpp index 813e6fb49b..cd134b0e89 100644 --- a/cpp/src/qpid/framing/FramingContent.cpp +++ b/cpp/src/qpid/framing/FramingContent.cpp @@ -18,12 +18,10 @@ * under the License. * */ -#include - #include "Buffer.h" #include "FramingContent.h" -#include "qpid/QpidError.h" -#include +#include "qpid/Exception.h" +#include "qpid/framing/reply_exceptions.h" namespace qpid { namespace framing { @@ -37,12 +35,12 @@ Content::Content(uint8_t _discriminator, const string& _value): discriminator(_d void Content::validate() { if (discriminator == REFERENCE) { if(value.empty()) { - THROW_QPID_ERROR(FRAMING_ERROR, "Reference cannot be empty"); + throw InvalidArgumentException( + QPID_MSG("Reference cannot be empty")); } }else if (discriminator != INLINE) { - std::stringstream out; - out << "Invalid discriminator: " << (int) discriminator; - THROW_QPID_ERROR(FRAMING_ERROR, out.str()); + throw SyntaxErrorException( + QPID_MSG("Invalid discriminator: " << discriminator)); } } -- cgit v1.2.1