From 428de9b6fe6f81f2bfc3f47d5db013b4b00da6a2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 16 Oct 2007 19:07:54 +0000 Subject: * Summary: generalized Invoker visitor to all *Operations and *Handler classes, client and broker. Single template free function invoke(Invocable, const AMQBody&); works for all invocable handlers. * rubygen/templates/OperationsInvoker.rb: Generates invoker visitors for all Operations classes, client and server. * src/qpid/framing/Invoker.h: Invoker base class and template invoke() function. * rubygen/templates/structs.rb: add generic invoke method template to invoke an arbitrary object with the correct memeber function. * src/qpid/framing/AMQMethodBody.cpp, .h: Removed invoke(), replaced by qpid::framing::invoke() * src/qpid/broker/SemanticHandler.cpp, ConnectionHandler.cpp: Replace AMQMethodBody::invoke with invoke() free function. * src/qpid/framing/StructHelper.h: Avoid un-necessary alloc and copy in encode/decode. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@585223 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/SemanticHandler.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'cpp/src/qpid/broker/SemanticHandler.cpp') diff --git a/cpp/src/qpid/broker/SemanticHandler.cpp b/cpp/src/qpid/broker/SemanticHandler.cpp index dc5407be99..8535dc6a60 100644 --- a/cpp/src/qpid/broker/SemanticHandler.cpp +++ b/cpp/src/qpid/broker/SemanticHandler.cpp @@ -28,7 +28,7 @@ #include "Connection.h" #include "qpid/framing/ExecutionCompleteBody.h" #include "qpid/framing/ExecutionResultBody.h" -#include "qpid/framing/InvocationVisitor.h" +#include "qpid/framing/ServerInvoker.h" #include #include @@ -121,14 +121,13 @@ void SemanticHandler::handleCommand(framing::AMQMethodBody* method) { SequenceNumber id = incoming.next(); BrokerAdapter adapter(state); - InvocationVisitor v(&adapter); - method->accept(v); + Invoker::Result invoker = invoke(adapter, *method); incoming.complete(id); - if (!v.wasHandled()) { + if (!invoker.wasHandled()) { throw ConnectionException(540, "Not implemented"); - } else if (v.hasResult()) { - session.getProxy().getExecution().result(id.getValue(), v.getResult()); + } else if (invoker.hasResult()) { + session.getProxy().getExecution().result(id.getValue(), invoker.getResult()); } if (method->isSync()) { incoming.sync(id); @@ -139,9 +138,8 @@ void SemanticHandler::handleCommand(framing::AMQMethodBody* method) void SemanticHandler::handleL3(framing::AMQMethodBody* method) { - if (!method->invoke(this)) { + if (!invoke(*this, *method)) throw ConnectionException(540, "Not implemented"); - } } void SemanticHandler::handleContent(AMQFrame& frame) -- cgit v1.2.1