QPID-1201: fixed up version of aidan's patch, there are still failures when running against an external java broker, however we seem to get past basic connection negotiation now

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@680602 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 39 insertions, 75 deletions

diff --git a/java/common/src/main/java/org/apache/qpidity/ToyClient.java b/java/common/src/main/java/org/apache/qpidity/ToyClient.java
index f6d2829504..0912f3bdd9 100644
--- a/java/common/src/main/java/org/apache/qpidity/ToyClient.java
+++ b/java/common/src/main/java/org/apache/qpidity/ToyClient.java
@@ -76,9 +76,7 @@ class ToyClient extends SessionDelegate
                                                   public void closed() {}
                                               });
         conn.send(new ProtocolHeader
-                  (1,
-                   TransportConstants.getVersionMajor(),
-                   TransportConstants.getVersionMinor()));
+                  (1, 0, 10));
 
         Channel ch = conn.getChannel(0);
         Session ssn = new Session("my-session".getBytes());
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ClientDelegate.java b/java/common/src/main/java/org/apache/qpidity/transport/ClientDelegate.java
index 699854fb3b..e770157af4 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ClientDelegate.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/ClientDelegate.java
@@ -31,10 +31,9 @@ public abstract class ClientDelegate extends ConnectionDelegate
 
     public void init(Channel ch, ProtocolHeader hdr)
     {
-        if (hdr.getMajor() != TransportConstants.getVersionMajor() &&
-            hdr.getMinor() != TransportConstants.getVersionMinor())
+        if (hdr.getMajor() != 0 && hdr.getMinor() != 10)
         {
-            throw new RuntimeException("version missmatch: " + hdr);
+            throw new ProtocolVersionException(hdr.getMajor(), hdr.getMinor());
         }
     }
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java b/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
index 962dd9a5da..14bde3f18d 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
@@ -82,28 +82,12 @@ public abstract class ConnectionDelegate extends MethodDelegate<Channel>
 
     public void init(Channel ch, ProtocolHeader hdr)
     {
-        ch.getConnection().send(new ProtocolHeader
-                                (1,
-                                 TransportConstants.getVersionMajor(),
-                                 TransportConstants.getVersionMinor()));
-        if (hdr.getMajor() != TransportConstants.getVersionMajor() &&
-            hdr.getMinor() != TransportConstants.getVersionMinor())
-        {
-            // XXX
-            ch.getConnection().send(new ProtocolHeader
-                                    (1,
-                                     TransportConstants.getVersionMajor(),
-                                     TransportConstants.getVersionMinor()));
-            ch.getConnection().close();
-        }
-        else
-        {
-            List<Object> plain = new ArrayList<Object>();
-            plain.add("PLAIN");
-            List<Object> utf8 = new ArrayList<Object>();
-            utf8.add("utf8");
-            ch.connectionStart(null, plain, utf8);
-        }
+        ch.getConnection().send(new ProtocolHeader (1, hdr.getMajor(), hdr.getMinor()));
+        List<Object> plain = new ArrayList<Object>();
+        plain.add("PLAIN");
+        List<Object> utf8 = new ArrayList<Object>();
+        utf8.add("utf8");
+        ch.connectionStart(null, plain, utf8);
     }
 
     // ----------------------------------------------
@@ -294,8 +278,4 @@ public abstract class ConnectionDelegate extends MethodDelegate<Channel>
         _virtualHost = host;
     }
 
-    public String getUnsupportedProtocol()
-    {
-        return null;
-    }
 }
diff --git a/java/common/src/main/java/org/apache/qpidity/ProtocolException.java b/java/common/src/main/java/org/apache/qpidity/transport/ProtocolVersionException.java
index 596143a1b9..86fe7a3f3f 100644
--- a/java/common/src/main/java/org/apache/qpidity/ProtocolException.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/ProtocolVersionException.java
@@ -1,4 +1,6 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  The ASF licenses this file
@@ -14,23 +16,37 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
  */
+package org.apache.qpidity.transport;
 
-package org.apache.qpidity;
 
-public class ProtocolException extends QpidException
+/**
+ * ProtocolVersionException
+ *
+ */
+
+public final class ProtocolVersionException extends TransportException
 {
-     /**
-     * Constructor for a Ptotocol Exception.
-     * <p> This is the only provided constructor and the parameters have to be set to null when
-     * they are unknown.
-     * @param message    A description of the reason of this exception.
-     * @param errorCode  A string specifyin the error code of this exception.
-     * @param cause     The linked Execption.
-     *
-     */
-    public ProtocolException(String message, ErrorCode errorCode, Throwable cause)
+
+    private final byte major;
+    private final byte minor;
+
+    public ProtocolVersionException(byte major, byte minor)
     {
-        super(message, errorCode, cause);
+        super(String.format("version missmatch: %s-%s", major, minor));
+        this.major = major;
+        this.minor = minor;
     }
+
+    public byte getMajor()
+    {
+        return this.major;
+    }
+
+    public byte getMinor()
+    {
+        return this.minor;
+    }
+
 }
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/TransportConstants.java b/java/common/src/main/java/org/apache/qpidity/transport/TransportConstants.java
deleted file mode 100644
index e9a0705de0..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/transport/TransportConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.qpidity.transport;
-
-public class TransportConstants
-{
-
-    private static byte _protocol_version_minor = 10;
-    private static byte _protocol_version_major = 0;
-
-    public static void setVersionMajor(byte value)
-    {
-        _protocol_version_major = value;
-    }
-
-    public static void setVersionMinor(byte value)
-    {
-        _protocol_version_minor = value;
-    }
-
-    public static byte getVersionMajor()
-    {
-        return _protocol_version_major;
-    }
-
-    public static byte getVersionMinor()
-    {
-        return _protocol_version_minor;
-    }
-
-}