2 files changed, 17 insertions, 2 deletions
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/cpp/src/qpid/framing/AMQMethodBody.cpp
index 924d906d43..48b50763fc 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.cpp
+++ b/cpp/src/qpid/framing/AMQMethodBody.cpp
@@ -19,10 +19,25 @@
  *
  */
 #include "AMQMethodBody.h"
+#include "qpid/framing/InvocationVisitor.h"
 
 namespace qpid {
 namespace framing {
 
 AMQMethodBody::~AMQMethodBody() {}
 
+void AMQMethodBody::invoke(AMQP_ServerOperations& ops) 
+{ 
+    InvocationVisitor v(&ops);
+    accept(v);
+    assert(v.wasHandled()); 
+}
+
+bool AMQMethodBody::invoke(Invocable* invocable) 
+{ 
+    InvocationVisitor v(invocable);
+    accept(v);
+    return v.wasHandled(); 
+}
+
 }} // namespace qpid::framing
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/cpp/src/qpid/framing/AMQMethodBody.h
index 9c776e143b..5acb3a7b66 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/cpp/src/qpid/framing/AMQMethodBody.h
@@ -50,8 +50,8 @@ class AMQMethodBody : public AMQBody {
     virtual MethodId amqpMethodId() const = 0;
     virtual ClassId  amqpClassId() const = 0;
     
-    virtual void invoke(AMQP_ServerOperations&) { assert(0); }
-    virtual bool invoke(Invocable*) { return false; }
+    void invoke(AMQP_ServerOperations&);
+    bool invoke(Invocable*);
 
     template <class T> bool isA() const {
         return amqpClassId()==T::CLASS_ID && amqpMethodId()==T::METHOD_ID;