diff options
| author | Alan Conway <aconway@apache.org> | 2007-10-31 14:50:58 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-10-31 14:50:58 +0000 |
| commit | 3d05570dc824c704285bfef1ff810fbb1589f596 (patch) | |
| tree | c5d0bb12cc16af83f3b0e189dc0a48409a218522 /cpp/src/qpid/client | |
| parent | 9d7759e7acb7f14f3e291f721f7235c7769a2499 (diff) | |
| download | qpid-python-3d05570dc824c704285bfef1ff810fbb1589f596.tar.gz | |
Fix client side core dump when disconneced unexpectedly:
void qpid::client::SessionCore::invariant() const: Assertion
Minor items:
src/qpid/broker/Queue.cpp: info log for each message dispatched.
src/qpid/broker/SessionHandler.cpp: check attached in handleOut()
src/qpid/sys/Dispatcher.cpp: use polymorphic_downcast to catch cast errors in debug builds.
src/qpid/client/SessionCore.cpp: fix incorrect asserts
src/qpid/client/Message.h: convenience constructor parameters
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@590688 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client')
| -rw-r--r-- | cpp/src/qpid/client/Message.h | 5 | ||||
| -rw-r--r-- | cpp/src/qpid/client/SessionCore.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/Message.h b/cpp/src/qpid/client/Message.h index 655fc89457..b2ae273813 100644 --- a/cpp/src/qpid/client/Message.h +++ b/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/cpp/src/qpid/client/SessionCore.cpp b/cpp/src/qpid/client/SessionCore.cpp index ea877f9b40..f7f0f52dba 100644 --- a/cpp/src/qpid/client/SessionCore.cpp +++ b/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; |
