5 files changed, 12 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index d668ee0505..44ed743880 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -182,6 +182,7 @@ Consumer::ptr Queue::allocate()
 
 bool Queue::dispatch(QueuedMessage& msg)
 {
+    QPID_LOG(info, "Dispatch message " << msg.position << " from queue " << name);
     //additions to the acquirers will result in a separate dispatch
     //request, so won't result in anyone being missed
     uint counter = getAcquirerCount();
diff --git a/qpid/cpp/src/qpid/broker/SessionHandler.cpp b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
index 9b065be8af..49492ffed1 100644
--- a/qpid/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
@@ -80,6 +80,9 @@ void SessionHandler::handleIn(AMQFrame& f) {
 }
 
 void SessionHandler::handleOut(AMQFrame& f) {
+    if (!session.get())
+        throw InternalErrorException(
+            QPID_MSG("attempt to send frame on detached channel."));
     channel.handle(f);          // Send it.
     if (session->sent(f))
         peerSession.solicitAck();
diff --git a/qpid/cpp/src/qpid/client/Message.h b/qpid/cpp/src/qpid/client/Message.h
index 655fc89457..b2ae273813 100644
--- a/qpid/cpp/src/qpid/client/Message.h
+++ b/qpid/cpp/src/qpid/client/Message.h
@@ -38,7 +38,10 @@ namespace client {
 class Message : public framing::TransferContent 
 {
 public:
-    Message(const std::string& data_=std::string()) : TransferContent(data_) {}
+    Message(const std::string& data_=std::string(),
+            const std::string& routingKey=std::string(),
+            const std::string& exchange=std::string()
+    ) : TransferContent(data_, routingKey, exchange) {}
 
     std::string getDestination() const 
     { 
diff --git a/qpid/cpp/src/qpid/client/SessionCore.cpp b/qpid/cpp/src/qpid/client/SessionCore.cpp
index ea877f9b40..f7f0f52dba 100644
--- a/qpid/cpp/src/qpid/client/SessionCore.cpp
+++ b/qpid/cpp/src/qpid/client/SessionCore.cpp
@@ -62,13 +62,11 @@ inline void SessionCore::invariant() const {
       case CLOSING:
       case SUSPENDING:
         assert(session);
-        assert(code==REPLY_SUCCESS);
         assert(connection);
         assert(channel.get());
         assert(channel.next == connection.get());
         break;
       case SUSPENDED:
-        assert(code==REPLY_SUCCESS);
         assert(session);
         assert(!connection);
         break;
diff --git a/qpid/cpp/src/qpid/sys/Dispatcher.cpp b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
index b8751168c2..d49af9d079 100644
--- a/qpid/cpp/src/qpid/sys/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
@@ -21,6 +21,8 @@
 
 #include "Dispatcher.h"
 
+#include <boost/cast.hpp>
+
 #include <assert.h>
 
 namespace qpid {
@@ -36,7 +38,8 @@ Dispatcher::~Dispatcher() {
 void Dispatcher::run() {
     do {
         Poller::Event event = poller->wait();
-        DispatchHandle* h = static_cast<DispatchHandle*>(event.handle);
+        DispatchHandle* h =
+            boost::polymorphic_downcast<DispatchHandle*>(event.handle);
 
         // If can read/write then dispatch appropriate callbacks        
         if (h) {