You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/10/10 11:44:09 UTC
svn commit: r703369 - in
/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport:
ClientDelegate.java Connection.java
Author: ritchiem
Date: Fri Oct 10 02:44:09 2008
New Revision: 703369
URL: http://svn.apache.org/viewvc?rev=703369&view=rev
Log:
QPID-1344 QPID-1339 : Fixed the two issues preventing protocol negotiation
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java?rev=703369&r1=703368&r2=703369&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java Fri Oct 10 02:44:09 2008
@@ -64,11 +64,12 @@
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)
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=703369&r1=703368&r2=703369&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Fri Oct 10 02:44:09 2008
@@ -175,7 +175,15 @@
Throwable t = error;
error = null;
close();
- throw new ConnectionException(t);
+
+ if (t instanceof ProtocolVersionException)
+ {
+ throw (ProtocolVersionException) t;
+ }
+ else
+ {
+ throw new ConnectionException(t);
+ }
}
switch (state)