QPID-1344 QPID-1339 : Fixed the two issues preventing protocol negotiation

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

2 files changed, 11 insertions, 2 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 316c26429e..d782170aa5 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -64,11 +64,12 @@ public class ClientDelegate extends ConnectionDelegate
 
     public void init(Channel ch, ProtocolHeader hdr)
     {
-        if (hdr.getMajor() != 0 && hdr.getMinor() != 10)
+        if (!(hdr.getMajor() == 0 && hdr.getMinor() == 10))
         {
             Connection conn = ch.getConnection();
             conn.exception(new ProtocolVersionException(hdr.getMajor(), hdr.getMinor()));
         }
+
     }
 
     @Override public void connectionStart(Channel ch, ConnectionStart start)
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index ae9420eb1a..fd55da969a 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -175,7 +175,15 @@ public class Connection
                 Throwable t = error;
                 error = null;
                 close();
-                throw new ConnectionException(t);
+                
+                if (t instanceof ProtocolVersionException)
+                {
+                    throw (ProtocolVersionException) t;
+                }
+                else
+                {
+                    throw new ConnectionException(t);
+                }
             }
 
             switch (state)