diff options
| author | Alan Conway <aconway@apache.org> | 2007-03-14 16:05:50 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-03-14 16:05:50 +0000 |
| commit | 73e8bdf78e87ee9e5cdd92b1f085ae8255b252aa (patch) | |
| tree | b74a1d6a56b26dc934d564350bab4c5007ce3eef | |
| parent | f627ac7ef1c409275b73f5f330da260fe90ad64b (diff) | |
| download | qpid-python-73e8bdf78e87ee9e5cdd92b1f085ae8255b252aa.tar.gz | |
Recorded rollback of revisions 492756 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@518198 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | gentools/templ.java/MethodBodyClass.tmpl | 26 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java | 6 |
2 files changed, 22 insertions, 10 deletions
diff --git a/gentools/templ.java/MethodBodyClass.tmpl b/gentools/templ.java/MethodBodyClass.tmpl index 21599956da..42582fcb7c 100644 --- a/gentools/templ.java/MethodBodyClass.tmpl +++ b/gentools/templ.java/MethodBodyClass.tmpl @@ -153,16 +153,28 @@ public class ${CLASS}${METHOD}Body extends AMQMethodBody implements EncodableAMQ return buf.toString(); } - public static AMQFrame createAMQFrame(int _channelId, byte major, byte minor + public static ${CLASS}${METHOD}Body createMethodBody(byte major, byte minor %{FLIST} ${mb_field_parameter_list} ) { - ${CLASS}${METHOD}Body body = new ${CLASS}${METHOD}Body(major, minor); -%{FLIST} ${mb_field_body_initialize} + return createMethodBody(major, minor, getClazz(major, minor), getMethod(major, minor) +%{FLIST} ${mb_field_passed_parameter_list} + ); + } - AMQFrame frame = new AMQFrame(); - frame.channel = _channelId; - frame.bodyFrame = body; - return frame; + public static ${CLASS}${METHOD}Body createMethodBody(byte major, byte minor, int clazzID, int methodID +%{FLIST} ${mb_field_parameter_list} + ) + { + return new ${CLASS}${METHOD}Body(major, minor, clazzID, methodID +%{FLIST} ${mb_field_passed_parameter_list} + ); + } + + public ${CLASS}${METHOD}Body copy() + { + return new ${CLASS}${METHOD}Body(major, minor, getClazz(major, minor), getMethod(major, minor) +%{FLIST} ${mb_field_passed_parameter_list} + ); } } diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java index 6b88d605e1..b641579376 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java @@ -253,14 +253,14 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, String locales = "en_US"; // Interfacing with generated code - be aware of possible changes to parameter order as versions change. - AMQFrame response = ConnectionStartBody.createAMQFrame((short) 0, - _major, _minor, // AMQP version (major, minor) + AMQMethodBody connectionStartBody = ConnectionStartBody.createMethodBody + ((byte)_major, (byte)_minor, // AMQP version (major, minor) locales.getBytes(), // locales mechanisms.getBytes(), // mechanisms null, // serverProperties (short)_major, // versionMajor (short)_minor); // versionMinor - _minaProtocolSession.write(response); + writeRequest(0, connectionStartBody, _stateManager); } catch (AMQException e) { |