Check valid listener (or handler) exist and log error if not. See QPID-783.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@620479 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 4 deletions

diff --git a/qpid/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp
index 0783d5bc55..8df4637c88 100644
--- a/qpid/cpp/src/qpid/client/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/client/Dispatcher.cpp
@@ -75,11 +75,18 @@ void Dispatcher::run()
             if (content->isA<MessageTransferBody>()) {
                 Message msg(*content, session);
                 Subscriber::shared_ptr listener = find(msg.getDestination());
-                assert(listener);
-                listener->received(msg);
+                if (!listener) {
+                    QPID_LOG(error, "No listener found for destination " << msg.getDestination());
+                } else {
+                    assert(listener);
+                    listener->received(msg);
+                }
             } else {
-                assert (handler.get());
-                handler->handle(*content);
+                if (handler.get()) {
+                    handler->handle(*content);
+                } else {
+                    QPID_LOG(error, "No handler found for " << *(content->getMethod()));
+                }
             }
         }
     } catch (const ClosedException&) {