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

1 files changed, 6 insertions, 8 deletions

diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/cpp/src/qpid/framing/AMQFrame.cpp
index abd33c4158..423af06173 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/cpp/src/qpid/framing/AMQFrame.cpp
@@ -20,9 +20,9 @@
  */
 #include "AMQFrame.h"
 
-#include "qpid/QpidError.h"
 #include "qpid/framing/variant.h"
 #include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/reply_exceptions.h"
 
 #include <boost/format.hpp>
 
@@ -103,7 +103,7 @@ bool AMQFrame::decode(Buffer& buffer)
     uint8_t  flags = buffer.getOctet();
     uint8_t framing_version = (flags & 0xc0) >> 6;
     if (framing_version != 0)
-        THROW_QPID_ERROR(FRAMING_ERROR, "Framing version unsupported");
+        throw SyntaxErrorException(QPID_MSG("Framing version unsupported"));
     bof = flags & 0x08;
     eof = flags & 0x04;
     bos = flags & 0x02;
@@ -111,7 +111,7 @@ bool AMQFrame::decode(Buffer& buffer)
     uint8_t  type = buffer.getOctet();
     uint16_t frame_size =  buffer.getShort();
     if (frame_size < frameOverhead()-1)
-        THROW_QPID_ERROR(FRAMING_ERROR, "Frame size too small");    
+        throw SyntaxErrorException(QPID_MSG("Frame size too small"));    
     uint8_t  reserved1 = buffer.getOctet();
     uint8_t  field1 = buffer.getOctet();
     subchannel = field1 & 0x0f;
@@ -121,7 +121,7 @@ bool AMQFrame::decode(Buffer& buffer)
     // Verify that the protocol header meets current spec
     // TODO: should we check reserved2 against zero as well? - the spec isn't clear
     if ((flags & 0x30) != 0 || reserved1 != 0 || (field1 & 0xf0) != 0)
-        THROW_QPID_ERROR(FRAMING_ERROR, "Reserved bits not zero");
+        throw SyntaxErrorException(QPID_MSG("Reserved bits not zero"));
 
     // TODO: should no longer care about body size and only pass up B,E,b,e flags
     uint16_t body_size = frame_size + 1 - frameOverhead(); 
@@ -133,7 +133,7 @@ bool AMQFrame::decode(Buffer& buffer)
 
     uint8_t end = buffer.getOctet();
     if (end != 0xCE)
-        THROW_QPID_ERROR(FRAMING_ERROR, "Frame end not found");
+        throw SyntaxErrorException(QPID_MSG("Frame end not found"));
     return true;
 }
 
@@ -147,9 +147,7 @@ void AMQFrame::decodeBody(Buffer& buffer, uint32_t size, uint8_t type)
       case HEARTBEAT_BODY: body = AMQHeartbeatBody(); break;
 
       default:
-	THROW_QPID_ERROR(
-            FRAMING_ERROR,
-            boost::format("Unknown frame type %d") % type);
+	throw SyntaxErrorException(QPID_MSG("Invalid frame type " << type));
     }
     boost::apply_visitor(DecodeVisitor(buffer,size), body);
 }