diff options
Diffstat (limited to 'qpid/java/client/src')
2 files changed, 9 insertions, 8 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java index 8857f1115a..c9212a54c1 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java @@ -68,6 +68,14 @@ public class ConnectionStartMethodHandler implements StateAwareMethodListener<Co ProtocolVersion pv = new ProtocolVersion((byte) body.getVersionMajor(), (byte) body.getVersionMinor()); + // 0-9-1 is indistinguishable from 0-9 using only major and minor ... if we established the connection as 0-9-1 + // and now get back major = 0 , minor = 9 then we can assume it means 0-9-1 + + if(pv.equals(ProtocolVersion.v0_9) && session.getProtocolVersion().equals(ProtocolVersion.v0_91)) + { + pv = ProtocolVersion.v0_91; + } + // For the purposes of interop, we can make the client accept the broker's version string. // If it does, it then internally records the version as being the latest one that it understands. // It needs to do this since frame lookup is done by version. diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java index 8910920017..2d59146b43 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java @@ -403,9 +403,7 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession _protocolVersion = pv; _methodRegistry = MethodRegistry.getMethodRegistry(pv); _methodDispatcher = ClientMethodDispatcherImpl.newMethodDispatcher(pv, this); - - // _registry = MainRegistry.getVersionSpecificRegistry(versionMajor, versionMinor); - } + } public byte getProtocolMinorVersion() { @@ -422,11 +420,6 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession return _protocolVersion; } -// public VersionSpecificRegistry getRegistry() -// { -// return _registry; -// } - public MethodRegistry getMethodRegistry() { return _methodRegistry; |