diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2007-01-04 21:30:39 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2007-01-04 21:30:39 +0000 |
| commit | 363a0a519d9997fc1e07f0732b2dd09b162d807d (patch) | |
| tree | 547e7cb609f15c0b419294c0c81d7911b766a52d /qpid/java/broker | |
| parent | 786c2fe29eebf63387e62fe83134d5d693626c32 (diff) | |
| download | qpid-python-363a0a519d9997fc1e07f0732b2dd09b162d807d.tar.gz | |
Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and tidy-up in related code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@492756 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java index 9ff6b96690..831117d2c6 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java @@ -165,17 +165,14 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, _minor = pi.protocolMinor; String mechanisms = ApplicationRegistry.getInstance().getAuthenticationManager().getMechanisms(); String locales = "en_US"; - // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) - // TODO: Connect this to the session version obtained from ProtocolInitiation for this session. - // Be aware of possible changes to parameter order as versions change. + // Interfacing with generated code - be aware of possible changes to parameter order as versions change. AMQFrame response = ConnectionStartBody.createAMQFrame((short) 0, - (byte)8, (byte)0, // AMQP version (major, minor) + _major, _minor, // AMQP version (major, minor) locales.getBytes(), // locales mechanisms.getBytes(), // mechanisms null, // serverProperties - (short)8, // versionMajor - (short)0 // versionMinor - ); + (short)_major, // versionMajor + (short)_minor); // versionMinor _minaProtocolSession.write(response); } catch (AMQException e) |