Author: aconway
Date: Tue Aug 14 09:15:26 2007
New Revision: 565821
URL: http://svn.apache.org/viewvc?view=rev&rev=565821
Log:
Removed unused types: RequestId, ResponseId, MethodContext.
Removed:
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/MethodContext.h
Modified:
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb
incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h
incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp
Modified:
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
---
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
(original)
+++
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
Tue Aug 14 09:15:26 2007
@@ -35,7 +35,6 @@
public AmqpOrdinalVersionMap indexMap;
public AmqpFlagMap clientMethodFlagMap; // Method called on client
(<chassis name="server"> in XML)
public AmqpFlagMap serverMethodFlagMap; // Method called on server
(<chassis name="client"> in XML)
- public AmqpFlagMap isResponseFlagMap;
public boolean content;
public AmqpMethod(String name, LanguageConverter converter)
@@ -47,14 +46,8 @@
indexMap = new AmqpOrdinalVersionMap();
clientMethodFlagMap = new AmqpFlagMap();
serverMethodFlagMap = new AmqpFlagMap();
- isResponseFlagMap = new AmqpFlagMap();
}
- public boolean isResponse(AmqpVersion version) {
- if (!CppGenerator.USE_RELIABLE_FRAMING) return false;
- return (version == null) ? isResponseFlagMap.isSet() :
isResponseFlagMap.isSet(version);
- }
-
/** Check if this method is named as a response by any other method in
the class. */
public void checkForResponse(Element methodElement, AmqpVersion
version) {
Element clazz = (Element)methodElement.getParentNode();
@@ -66,7 +59,6 @@
for (int j =0; j<responses.getLength(); ++j) {
Element response = (Element)responses.item(j);
if (methodName.equals(response.getAttribute("name"))) {
- isResponseFlagMap.setFlagForVersion(true, version);
}
}
}
@@ -139,7 +131,6 @@
{
clientMethodFlagMap.removeVersion(version);
serverMethodFlagMap.removeVersion(version);
- isResponseFlagMap.removeVersion(version);
indexMap.removeVersion(version);
fieldMap.removeVersion(version);
versionSet.remove(version);
Modified:
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
---
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
(original)
+++
incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
Tue Aug 14 09:15:26 2007
@@ -29,8 +29,6 @@
public class CppGenerator extends Generator
{
- protected static final boolean USE_RELIABLE_FRAMING = false;
-
protected static final String versionNamespaceStartToken =
"${version_namespace_start}";
protected static final String versionNamespaceEndToken =
"${version_namespace_end}";
@@ -379,9 +377,7 @@
}
private String baseClass(AmqpMethod method, AmqpVersion version) {
- if (!USE_RELIABLE_FRAMING) return "AMQMethodBody";
- String base = method.isResponse(version) ?
"AMQResponseBody":"AMQRequestBody";
- return base;
+ return "AMQMethodBody";
}
@Override
@@ -769,7 +765,7 @@
for (String thisMethodName : thisClass.methodMap.keySet())
{
AmqpMethod method = thisClass.methodMap.get(thisMethodName);
- String returnType = (abstractMethodFlag ||
method.isResponse(null))? "void" : "RequestId";
+ String returnType = "void";
boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
if ((serverFlag && serverChassisFlag) || (!serverFlag &&
clientChassisFlag))
@@ -784,7 +780,7 @@
sb.append(indent + "virtual "+returnType+" "+
methodName + "(");
if (abstractMethodFlag &&
isSpecialCase(thisClass.name, method.name)) {
- sb.append("const MethodContext& context");
+ sb.append("const AMQMethodBody& context");
} else {
sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize),
false, true, true));
}
@@ -906,7 +902,6 @@
sb.append(indent + "{" + cr);
sb.append(indent + "private:" + cr);
sb.append(indent + tab + "ChannelAdapter& channel;" + cr);
- sb.append(indent + tab + "RequestId responseTo;" + cr);
sb.append(cr);
sb.append(indent + "public:" + cr);
sb.append(indent + tab + "// Constructors and destructors" +
cr);
@@ -917,7 +912,6 @@
sb.append(cr);
sb.append(indent + tab + "static "+className+"& get(" +
proxyOuterClassName(serverFlag)+"& proxy) { return
proxy.get"+className+"();}\n\n");
sb.append(indent + tab + "// set for response correlation" +
cr);
- sb.append(indent + tab + "void setResponseTo(RequestId r) {
responseTo = r; }" + cr);
sb.append(cr);
sb.append(indent + tab + "// Protocol methods" + cr);
sb.append(cr);
@@ -1021,16 +1015,10 @@
AmqpVersionSet versionSet =
overloadededParameterMap.get(thisFieldMap);
if (!first)
sb.append(cr);
- String returnType = method.isResponse(null) ?
"void" : "RequestId";
+ String returnType = "void";
sb.append(indent + returnType + " " +
outerclassName + "::" + thisClass.name + "::" +
methodName + "(");
sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize),
false, true, true));
- if (method.isResponse(null)) {
- /*
- if (!thisFieldMap.isEmpty()) sb.append(",
");
- sb.append("RequestId responseTo");
- */
- }
sb.append(")");
if (versionSet.size() !=
globalVersionSet.size())
sb.append(" // AMQP Version(s) " +
versionSet);
@@ -1094,9 +1082,8 @@
String tab = Utils.createSpaces(tabSize);
String namespace = version != null ? version.namespace() + "::" : "";
StringBuffer sb = new StringBuffer();
- sb.append(indent+tab+(method.isResponse(version) ? "" : "return
")+"channel.send(make_shared_ptr(new ");
+ sb.append(indent+tab+"channel.send(make_shared_ptr(new ");
sb.append(namespace + methodBodyClassName + "( channel.getVersion()");
- if (method.isResponse(version)) sb.append(", responseTo");
sb.append(generateMethodParameterList(fieldMap, indentSize +
(5*tabSize), true, false, true));
sb.append(")));\n");
return sb.toString();
@@ -1454,18 +1441,11 @@
String indent = Utils.createSpaces(indentSize);
String tab = Utils.createSpaces(tabSize);
StringBuffer sb = new StringBuffer();
- if (method.fieldMap.size() > 0 || method.isResponse(version))
+ if (method.fieldMap.size() > 0)
{
sb.append(indent + thisClass.name +
Utils.firstUpper(method.name) + "Body(ProtocolVersion version," + cr);
- if (method.isResponse(version)) {
- sb.append(indent+tab+"RequestId toRequest");
- if (method.fieldMap.size() >0)
- sb.append(",\n");
- }
sb.append(generateFieldList(method.fieldMap, version, true,
false, 8));
sb.append(indent + tab + ") : " + baseClass(method, version) +
"(version");
- if (method.isResponse(version))
- sb.append(", 0, toRequest");
sb.append(")");
if (method.fieldMap.size() > 0)
sb.append(", \n" + generateFieldList(method.fieldMap,
version, false, true, 8));
@@ -1491,15 +1471,14 @@
if (bItr.next()) // This is a server operation
{
boolean fieldMapNotEmptyFlag =
method.fieldMap.size() > 0;
- sb.append(indent + "void
invoke(AMQP_ServerOperations& target, const MethodContext&"
- + (special ? " context)" : " )") +
cr);
+ sb.append(indent + "void
invoke(AMQP_ServerOperations& target)\n");
sb.append(indent + "{" + cr);
sb.append(indent + tab + "target.get" +
thisClass.name + "Handler()->" +
parseForReservedWords(Utils.firstLower(method.name),
thisClass.name
+ Utils.firstUpper(method.name) + "Body.invoke()") + "(");
if (special)
{
- sb.append("context");
+ sb.append("*this");
}
else if (fieldMapNotEmptyFlag)
{
Modified:
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
---
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
(original)
+++
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
Tue Aug 14 09:15:26 2007
@@ -36,7 +36,7 @@
namespace qpid {
namespace framing {
-class MethodContext;
+class AMQMethodBody;
class AMQP_ClientOperations
{
Modified:
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
---
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
(original)
+++
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
Tue Aug 14 09:15:26 2007
@@ -34,7 +34,7 @@
namespace qpid {
namespace framing {
-class MethodContext;
+class AMQMethodBody;
class Invocable
{
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb Tue Aug 14 09:15:26 2007
@@ -188,6 +188,7 @@
@outdir=outdir
@prefix='' # For indentation or comments.
@indentstr=' ' # One indent level.
+ @outdent=2
raise "Invalid output directory: #{outdir}" unless @outdir=="-" or
File.directory?(@outdir)
end
@@ -229,6 +230,14 @@
# Generate indented code
def indent(n=1,&block) prefix(@indentstr * n,&block); end
+ # Generate outdented code
+ def outdent(&block)
+ [EMAIL PROTECTED]
+ @[EMAIL PROTECTED]
+ yield
+ @prefix=save
+ end
+
attr_accessor :out
end
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb Tue Aug 14 09:15:26 2007
@@ -172,6 +172,9 @@
def variantl(types) "boost::variant<#{types.join(", \n")}>"; end
def blank_variant(types) variant(["boost::blank"]+types); end
def tuple(types) "boost::tuple<#{types.join(', ')}>"; end
-
+
+ def public() outdent { genl "public:" } end
+ def private() outdent { genl "private:" } end
+ def protected() outdent { genl "protected:" } end
end
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/Proxy.rb Tue Aug 14
09:15:26 2007
@@ -15,96 +15,51 @@
def inner_class_decl(c)
cname=c.name.caps
- gen <<EOS
- // ==================== class #{cname} ====================
- class #{cname}
- {
- private:
- ChannelAdapter& channel;
- RequestId responseTo;
-
- public:
- // Constructors and destructors
-
- #{cname}(ChannelAdapter& ch) :
- channel(ch) {}
- virtual ~#{cname}() {}
-
- static #{cname}& get([EMAIL PROTECTED]& proxy) { return
proxy.get#{cname}();}
- // set for response correlation
- void setResponseTo(RequestId r) { responseTo = r; }
-
- // Protocol methods
-EOS
- indent(2) { c.amqp_methods_on(@chassis).each { |m| inner_method_decl(m) } }
- gen "\n }; // class #{cname}\n\n"
- end
+ cpp_class(cname) {
+ gen <<EOS
+ChannelAdapter& channel;
+
+public:
+#{cname}(ChannelAdapter& ch) : channel(ch) {}
+virtual ~#{cname}() {}
+
+static #{cname}& get([EMAIL PROTECTED]& proxy) { return proxy.get#{cname}(); }
- def inner_method_decl(m)
- genl "virtual RequestId #{m.cppname}(#{m.signature.join(",\n
")});"
- genl
+EOS
+ c.amqp_methods_on(@chassis).each { |m|
+ genl "virtual void #{m.cppname}(#{m.signature.join(",\n
")});"
+ genl
+ }}
end
def inner_class_defn(c)
cname=c.cppname
- gen "// ==================== class #{cname} ====================\n"
- c.amqp_methods_on(@chassis).each { |m| inner_method_defn(m, cname) }
- end
-
- def inner_method_defn(m,cname)
- genl "RequestId [EMAIL
PROTECTED]::#{cname}::#{m.cppname}(#{m.signature.join(", ")})"
- scope {
- params=(["channel.getVersion()"]+m.param_names).join(", ")
- genl "return channel.send(make_shared_ptr(new
#{m.body_name}(#{params})));"
- }
- end
-
- def get_decl(c)
- cname=c.name.caps
- gen " #{cname}& get#{cname}();\n"
- end
-
- def get_defn(c)
- cname=c.name.caps
- gen <<EOS
[EMAIL PROTECTED]::#{c.name.caps}& [EMAIL PROTECTED]::get#{c.name.caps}()
-{
- return #{proxy_member(c)};
-}
-EOS
+ c.amqp_methods_on(@chassis).each { |m|
+ genl "void [EMAIL
PROTECTED]::#{cname}::#{m.cppname}(#{m.signature.join(", ")})"
+ scope {
+ params=(["channel.getVersion()"]+m.param_names).join(", ")
+ genl "channel.send(make_shared_ptr(new #{m.body_name}(#{params})));"
+ }}
end
def generate
# .h file
h_file(@filename) {
- gen <<EOS
-#include "qpid/framing/Proxy.h"
-
-namespace qpid {
-namespace framing {
-
-class [EMAIL PROTECTED] : public Proxy
-{
-public:
- [EMAIL PROTECTED](ChannelAdapter& ch);
-
- // Inner class definitions
-EOS
- @amqp.amqp_classes.each{ |c| inner_class_decl(c) }
- gen " // Inner class instance get methods\n"
- @amqp.amqp_classes.each{ |c| get_decl(c) }
- gen <<EOS
- private:
- // Inner class instances
-EOS
- indent { @amqp.amqp_classes.each{ |c| gen c.cppname+"
"+proxy_member(c)+";\n" } }
- gen <<EOS
-}; /* class [EMAIL PROTECTED] */
-
-} /* namespace framing */
-} /* namespace qpid */
-EOS
- }
+ include "qpid/framing/Proxy.h"
+ namespace("qpid::framing") {
+ cpp_class(@classname, "public Proxy") {
+ public
+ genl "[EMAIL PROTECTED](ChannelAdapter& ch);"
+ genl
+ @amqp.amqp_classes.each { |c|
+ inner_class_decl(c)
+ genl
+ genl "#{c.cppname}& get#{c.cppname}() { return #{proxy_member(c)};
}"
+ genl
+ }
+ private
+ @amqp.amqp_classes.each{ |c| gen c.cppname+" "+proxy_member(c)+";\n"
}
+ }}}
# .cpp file
cpp_file(@filename) {
@@ -112,30 +67,19 @@
include "[EMAIL PROTECTED]"
include "qpid/framing/ChannelAdapter.h"
include "qpid/framing/amqp_types_full.h"
- @amqp.amqp_methods_on(@chassis).each {
- |m| include "qpid/framing/#{m.body_name}.h" }
- gen <<EOS
-namespace qpid {
-namespace framing {
-
[EMAIL PROTECTED]::[EMAIL PROTECTED](ChannelAdapter& ch) :
-EOS
- gen " Proxy(ch)"
- @amqp.amqp_classes.each { |c| gen ",\n "+proxy_member(c)+"(channel)" }
- gen <<EOS
- {}
-
- // Inner class instance get methods
-EOS
- @amqp.amqp_classes.each { |c| get_defn(c) }
- gen " // Inner class implementation\n\n"
- @amqp.amqp_classes.each { |c| inner_class_defn(c) }
- genl "}} // namespae qpid::framing"
- }
+ Amqp.amqp_methods_on(@chassis).each { |m| include
"qpid/framing/"+m.body_name }
+ genl
+ namespace("qpid::framing") {
+ genl "[EMAIL PROTECTED]::[EMAIL PROTECTED](ChannelAdapter& ch) :"
+ gen " Proxy(ch)"
+ @amqp.amqp_classes.each { |c| gen ",\n
"+proxy_member(c)+"(channel)" }
+ genl "{}\n"
+ @amqp.amqp_classes.each { |c| inner_class_defn(c) }
+ }}
end
end
-ProxyGen.new("client", ARGV[0], Amqp).generate;
-ProxyGen.new("server", ARGV[0], Amqp).generate;
+ProxyGen.new("client", Outdir, Amqp).generate;
+ProxyGen.new("server", Outdir, Amqp).generate;
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Aug 14 09:15:26 2007
@@ -369,8 +369,6 @@
qpid/framing/HeaderProperties.h \
qpid/framing/InitiationHandler.h \
qpid/framing/InputHandler.h \
- qpid/framing/MethodContent.h \
- qpid/framing/MethodContext.h \
qpid/framing/OutputHandler.h \
qpid/framing/ProtocolInitiation.h \
qpid/framing/ProtocolVersion.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp Tue Aug 14
09:15:26 2007
@@ -400,18 +400,5 @@
//no specific action required, generic response handling should be
sufficient
}
-void BrokerAdapter::setResponseTo(RequestId r)
-{
- basicHandler.client.setResponseTo(r);
- channelHandler.client.setResponseTo(r);
- exchangeHandler.client.setResponseTo(r);
- bindingHandler.client.setResponseTo(r);
- messageHandler.client.setResponseTo(r);
- queueHandler.client.setResponseTo(r);
- txHandler.client.setResponseTo(r);
- dtxHandler.setResponseTo(r);
-}
-
-
}} // namespace qpid::broker
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h Tue Aug 14
09:15:26 2007
@@ -85,7 +85,6 @@
}
framing::AMQP_ClientProxy& getProxy() { return proxy; }
- void setResponseTo(framing::RequestId r);
private:
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h Tue Aug 14
09:15:26 2007
@@ -35,7 +35,6 @@
namespace qpid {
namespace framing {
-class MethodContext;
class ChannelAdapter;
class AMQHeaderBody;
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h Tue Aug
14 09:15:26 2007
@@ -33,7 +33,6 @@
namespace qpid {
namespace framing {
-class MethodContext;
class ChannelAdapter;
class BasicHeaderProperties;
class FieldTable;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp Tue
Aug 14 09:15:26 2007
@@ -48,27 +48,24 @@
};
MessageMessage::MessageMessage(
- ConnectionToken* publisher, RequestId requestId_, TransferPtr transfer_
+ ConnectionToken* publisher, TransferPtr transfer_
) : Message(publisher, transfer_->getDestination(),
transfer_->getRoutingKey(),
transfer_->getRejectUnroutable(),
transfer_->getImmediate(),
transfer_),
- requestId(requestId_),
transfer(transfer_)
{
assert(transfer->getBody().isInline());
}
MessageMessage::MessageMessage(
- ConnectionToken* publisher, RequestId requestId_, TransferPtr transfer_,
- ReferencePtr reference_
+ ConnectionToken* publisher, TransferPtr transfer_, ReferencePtr reference_
) : Message(publisher, transfer_->getDestination(),
transfer_->getRoutingKey(),
transfer_->getRejectUnroutable(),
transfer_->getImmediate(),
transfer_),
- requestId(requestId_),
transfer(transfer_),
reference(reference_)
{
@@ -178,7 +175,7 @@
ReferencePtr newRef(new Reference(refname));
Reference::AppendPtr newAppend(new
MessageAppendBody(channel.getVersion(), refname, content));
newRef->append(newAppend);
- MessageMessage newMsg(const_cast<ConnectionToken*>(getPublisher()), 0,
newTransfer, newRef);
+ MessageMessage newMsg(const_cast<ConnectionToken*>(getPublisher()),
newTransfer, newRef);
newMsg.transferMessage(channel, consumerTag, framesize);
return;
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h Tue
Aug 14 09:15:26 2007
@@ -43,13 +43,12 @@
typedef boost::shared_ptr<framing::MessageTransferBody> TransferPtr;
typedef boost::shared_ptr<Reference> ReferencePtr;
- MessageMessage(ConnectionToken* publisher, framing::RequestId, TransferPtr
transfer);
- MessageMessage(ConnectionToken* publisher, framing::RequestId, TransferPtr
transfer, ReferencePtr reference);
+ MessageMessage(ConnectionToken* publisher, TransferPtr transfer);
+ MessageMessage(ConnectionToken* publisher, TransferPtr transfer,
ReferencePtr reference);
MessageMessage();
// Default destructor okay
- framing::RequestId getRequestId() const {return requestId; }
TransferPtr getTransfer() const { return transfer; }
ReferencePtr getReference() const ;
@@ -86,7 +85,6 @@
const std::string& destination,
const framing::Content& body) const;
- framing::RequestId requestId;
const TransferPtr transfer;
const boost::shared_ptr<Reference> reference;
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.cpp Tue Aug
14 09:15:26 2007
@@ -21,14 +21,12 @@
#include "ConnectionAdapter.h"
#include "Connection.h"
-#include "qpid/framing/MethodContext.h"
using namespace qpid;
using namespace qpid::broker;
using qpid::framing::ReplyCode;
using qpid::framing::ClassId;
using qpid::framing::MethodId;
-using qpid::framing::MethodContext;
using qpid::framing::FieldTable;
void ConnectionAdapter::init(const framing::ProtocolInitiation& header) {
@@ -44,13 +42,11 @@
handler->client.close(code, text, classId, methodId);
}
-void ConnectionAdapter::handleMethodInContext(
- boost::shared_ptr<qpid::framing::AMQMethodBody> method,
- const MethodContext& context
-)
+void ConnectionAdapter::handleMethod(
+ boost::shared_ptr<qpid::framing::AMQMethodBody> method)
{
try{
- method->invoke(*this, context);
+ method->invoke(*this);
}catch(ConnectionException& e){
handler->client.close(e.code, e.toString(), method->amqpClassId(),
method->amqpMethodId());
}catch(std::exception& e){
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionAdapter.h Tue Aug
14 09:15:26 2007
@@ -47,8 +47,7 @@
void handle(framing::AMQFrame& frame);
//ChannelAdapter virtual methods:
- void handleMethodInContext(boost::shared_ptr<qpid::framing::AMQMethodBody>
method,
- const qpid::framing::MethodContext& context);
+ void handleMethod(boost::shared_ptr<qpid::framing::AMQMethodBody> method);
bool isOpen() const { return true; } //channel 0 is always open
//never needed:
void handleHeader(boost::shared_ptr<qpid::framing::AMQHeaderBody>) {}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp Tue Aug 14
09:15:26 2007
@@ -25,7 +25,6 @@
using qpid::framing::AMQP_ClientProxy;
using qpid::framing::Buffer;
using qpid::framing::FieldTable;
-using qpid::framing::MethodContext;
using std::string;
DtxHandlerImpl::DtxHandlerImpl(CoreRefs& parent) :
@@ -194,9 +193,4 @@
broker.getDtxManager().setTimeout(xid, timeout);
}
-void DtxHandlerImpl::setResponseTo(framing::RequestId r)
-{
- dClient.setResponseTo(r);
- cClient.setResponseTo(r);
-}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h Tue Aug 14
09:15:26 2007
@@ -36,8 +36,6 @@
public:
DtxHandlerImpl(CoreRefs& parent);
- void setResponseTo(framing::RequestId r);
-
// DtxCoordinationHandler:
void commit(u_int16_t ticket, const std::string& xid, bool onePhase);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp Tue
Aug 14 09:15:26 2007
@@ -54,7 +54,7 @@
}
void
-MessageHandlerImpl::append(const framing::MethodContext& /*context*/)
+MessageHandlerImpl::append(const framing::AMQMethodBody& )
{
throw ConnectionException(540, "References no longer supported");
}
@@ -157,14 +157,13 @@
}
void
-MessageHandlerImpl::transfer(const framing::MethodContext& context)
+MessageHandlerImpl::transfer(const framing::AMQMethodBody& context)
{
MessageTransferBody::shared_ptr transfer(
- boost::shared_polymorphic_downcast<MessageTransferBody>(
- context.methodBody));
+ make_shared_ptr(new MessageTransferBody(static_cast<const
MessageTransferBody&>(context))));
if (transfer->getBody().isInline()) {
- MessageMessage::shared_ptr message(new MessageMessage(&connection, 0,
transfer));
+ MessageMessage::shared_ptr message(new MessageMessage(&connection,
transfer));
channel.handleInlineTransfer(message);
} else {
throw ConnectionException(540, "References no longer supported");
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h Tue Aug
14 09:15:26 2007
@@ -40,7 +40,7 @@
public:
MessageHandlerImpl(CoreRefs& parent);
- void append(const framing::MethodContext& context);
+ void append(const framing::AMQMethodBody& context);
void cancel(const std::string& destination );
@@ -82,7 +82,7 @@
void resume(const std::string& reference,
const std::string& identifier );
- void transfer(const framing::MethodContext& context);
+ void transfer(const framing::AMQMethodBody& context);
void flow(const std::string& destination, u_int8_t unit, u_int32_t value);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp Tue Aug
14 09:15:26 2007
@@ -60,13 +60,12 @@
}
//ChannelAdapter virtual methods:
-void
SemanticHandler::handleMethodInContext(boost::shared_ptr<qpid::framing::AMQMethodBody>
method,
- const
qpid::framing::MethodContext& context)
+void
SemanticHandler::handleMethod(boost::shared_ptr<qpid::framing::AMQMethodBody>
method)
{
try {
if (!method->invoke(this)) {
//else do the usual:
- handleL4(method, context);
+ handleL4(method);
//(if the frameset is complete) we can move the execution-mark
//forward
@@ -113,8 +112,7 @@
}
}
-void SemanticHandler::handleL4(boost::shared_ptr<qpid::framing::AMQMethodBody>
method,
- const
qpid::framing::MethodContext& context)
+void SemanticHandler::handleL4(boost::shared_ptr<qpid::framing::AMQMethodBody>
method)
{
try{
if(getId() != 0 && !method->isA<ChannelOpenBody>() && !isOpen()) {
@@ -124,7 +122,7 @@
throw ConnectionException(504, out.str());
}
} else {
- method->invoke(*adapter, context);
+ method->invoke(*adapter);
}
}catch(const ChannelException& e){
adapter->getProxy().getChannel().close(
@@ -171,7 +169,7 @@
msg->deliver(*this, tag, token, connection.getFrameMax());
}
-RequestId SemanticHandler::send(shared_ptr<AMQBody> body)
+void SemanticHandler::send(shared_ptr<AMQBody> body)
{
Mutex::ScopedLock l(outLock);
uint8_t type(body->type());
@@ -182,5 +180,5 @@
//std::cout << "[" << this << "] allocated: " <<
outgoing.hwm.getValue() << " to " << *body << std::endl;
}
}
- return ChannelAdapter::send(body);
+ ChannelAdapter::send(body);
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.h Tue Aug 14
09:15:26 2007
@@ -48,18 +48,16 @@
framing::Window outgoing;
sys::Mutex outLock;
- void handleL4(boost::shared_ptr<qpid::framing::AMQMethodBody> method,
- const qpid::framing::MethodContext& context);
+ void handleL4(boost::shared_ptr<qpid::framing::AMQMethodBody> method);
//ChannelAdapter virtual methods:
- void handleMethodInContext(boost::shared_ptr<qpid::framing::AMQMethodBody>
method,
- const qpid::framing::MethodContext& context);
+ void handleMethod(boost::shared_ptr<qpid::framing::AMQMethodBody> method);
bool isOpen() const;
void handleHeader(boost::shared_ptr<qpid::framing::AMQHeaderBody>);
void handleContent(boost::shared_ptr<qpid::framing::AMQContentBody>);
void handleHeartbeat(boost::shared_ptr<qpid::framing::AMQHeartbeatBody>);
- framing::RequestId send(shared_ptr<framing::AMQBody> body);
+ void send(shared_ptr<framing::AMQBody> body);
//delivery adapter methods:
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp Tue Aug
14 09:15:26 2007
@@ -57,7 +57,7 @@
void handle(AMQFrame& frame) {
AMQMethodBody* body=dynamic_cast<AMQMethodBody*>(frame.body.get());
assert(body);
- body->invoke(adapter, MethodContext()); // TODO aconway 2007-07-24:
Remove MethodContext
+ body->invoke(adapter);
}
// Dummy methods.
@@ -65,9 +65,9 @@
virtual void handleContent(boost::shared_ptr<AMQContentBody>){}
virtual void handleHeartbeat(boost::shared_ptr<AMQHeartbeatBody>){}
virtual bool isOpen() const{ return true; }
- virtual void handleMethodInContext(shared_ptr<AMQMethodBody>, const
MethodContext&){}
+ virtual void handleMethod(shared_ptr<AMQMethodBody>){}
// No-op send.
- virtual RequestId send(shared_ptr<AMQBody>) { return 0; }
+ virtual void send(shared_ptr<AMQBody>) {}
//delivery adapter methods, also no-ops:
virtual DeliveryId deliver(Message::shared_ptr&,
DeliveryToken::shared_ptr) { return 0; }
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp Tue Aug 14
09:15:26 2007
@@ -31,7 +31,7 @@
buffer.putShort(amqpMethodId());
}
-void AMQMethodBody::invoke(AMQP_ServerOperations&, const MethodContext&){
+void AMQMethodBody::invoke(AMQP_ServerOperations&){
assert(0);
THROW_QPID_ERROR(PROTOCOL_ERROR, "Method not supported by AMQP Server.");
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h Tue Aug 14
09:15:26 2007
@@ -26,7 +26,6 @@
#include "AMQBody.h"
#include "Buffer.h"
#include "qpid/framing/AMQP_ServerOperations.h"
-#include "MethodContext.h"
namespace qpid {
namespace framing {
@@ -52,7 +51,7 @@
virtual MethodId amqpMethodId() const = 0;
virtual ClassId amqpClassId() const = 0;
- virtual void invoke(AMQP_ServerOperations&, const MethodContext&);
+ virtual void invoke(AMQP_ServerOperations&);
virtual bool invoke(Invocable* target);
template <class T> bool isA() {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp Tue Aug
14 09:15:26 2007
@@ -18,6 +18,7 @@
#include <boost/format.hpp>
#include "ChannelAdapter.h"
+#include "OutputHandler.h"
#include "AMQFrame.h"
#include "FrameHandler.h"
#include "qpid/Exception.h"
@@ -44,18 +45,11 @@
handlers.out= make_shared_ptr(new OutputHandlerFrameHandler(out));
}
-RequestId ChannelAdapter::send(shared_ptr<AMQBody> body)
+void ChannelAdapter::send(shared_ptr<AMQBody> body)
{
- RequestId requestId = 0;
assertChannelOpen();
AMQFrame frame(getVersion(), getId(), body);
handlers.out->handle(frame);
- return requestId;
-}
-
-void ChannelAdapter::handleMethod(AMQMethodBody::shared_ptr method) {
- assertMethodOk(*method);
- handleMethodInContext(method, MethodContext(this, method));
}
void ChannelAdapter::assertMethodOk(AMQMethodBody& method) const {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h Tue Aug 14
09:15:26 2007
@@ -34,7 +34,6 @@
namespace qpid {
namespace framing {
-class MethodContext;
class OutputHandler;
/**
@@ -67,12 +66,7 @@
ChannelId getId() const { return id; }
ProtocolVersion getVersion() const { return version; }
- /**
- * Send a frame.
- [EMAIL PROTECTED] body Body of the frame.
- [EMAIL PROTECTED] If body is a request, the ID assigned else 0.
- */
- virtual RequestId send(shared_ptr<AMQBody> body);
+ virtual void send(shared_ptr<AMQBody> body);
virtual bool isOpen() const = 0;
@@ -81,16 +75,12 @@
void assertChannelOpen() const;
void assertChannelNotOpen() const;
- virtual void handleMethodInContext(
- shared_ptr<AMQMethodBody> method,
- const MethodContext& context) = 0;
+ virtual void handleMethod(shared_ptr<AMQMethodBody>) = 0;
private:
class ChannelAdapterHandler;
friend class ChannelAdapterHandler;
- void handleMethod(shared_ptr<AMQMethodBody>);
-
ChannelId id;
ProtocolVersion version;
FrameHandler::Chains handlers;
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h Tue Aug 14 09:15:26
2007
@@ -19,7 +19,6 @@
*
*/
-#include "qpid/framing/MethodContext.h"
#include "qpid/framing/ChannelAdapter.h"
#include "qpid/framing/OutputHandler.h"
#include "qpid/framing/AMQFrame.h"
@@ -58,12 +57,7 @@
boost::shared_ptr<qpid::framing::AMQContentBody> b) { send(b); }
void handleHeartbeat(
boost::shared_ptr<qpid::framing::AMQHeartbeatBody> b) { send(b); }
- void handleMethodInContext(
- boost::shared_ptr<qpid::framing::AMQMethodBody> method,
- const qpid::framing::MethodContext& context)
- {
- context.channel->send(method);
- };
+ void handleMethod(boost::shared_ptr<qpid::framing::AMQMethodBody> method)
{ send(method); };
};
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp?view=diff&rev=565821&r1=565820&r2=565821
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp Tue Aug 14
09:15:26 2007
@@ -70,11 +70,11 @@
MessageTransferBody::shared_ptr t1(new MessageTransferBody(v));
// TODO aconway 2007-04-03: hack around lack of generated setters.
Clean this up.
const_cast<framing::Content&>(t1->getBody()) =
framing::Content(REFERENCE,"bar");
- MessageMessage::shared_ptr m1(new MessageMessage(0, 1, t1, r1));
+ MessageMessage::shared_ptr m1(new MessageMessage(0, t1, r1));
MessageTransferBody::shared_ptr t2(new MessageTransferBody(v));
const_cast<framing::Content&>(t2->getBody()) =
framing::Content(REFERENCE,"bar");
- MessageMessage::shared_ptr m2(new MessageMessage(0, 2, t2, r1));
+ MessageMessage::shared_ptr m2(new MessageMessage(0, t2, r1));
MessageAppendBody::shared_ptr a1(new MessageAppendBody(v));
MessageAppendBody::shared_ptr a2(new MessageAppendBody(v));
