You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/03/28 09:58:54 UTC
svn commit: r1306208 - in /qpid/trunk/qpid/java:
client/src/main/java/org/apache/qpid/client/AMQConnection.java
client/src/main/java/org/apache/qpid/client/Closeable.java
common/src/main/java/org/apache/qpid/transport/Connection.java
Author: kwall
Date: Wed Mar 28 07:58:53 2012
New Revision: 1306208
URL: http://svn.apache.org/viewvc?rev=1306208&view=rev
Log:
QPID-3912: Client failover fails to reconnect if a previous attempted reconnection has failed 'late' in the connection start process.
Applied patch from Andrew MacBean <an...@gmail.com> and myself.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1306208&r1=1306207&r2=1306208&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java Wed Mar 28 07:58:53 2012
@@ -578,6 +578,7 @@ public class AMQConnection extends Close
public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException, AMQException
{
+ resetClosedFlag();
return _delegate.makeBrokerConnection(brokerDetail);
}
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java?rev=1306208&r1=1306207&r2=1306208&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java Wed Mar 28 07:58:53 2012
@@ -81,7 +81,7 @@ public abstract class Closeable
}
/**
- * Checks if this is closis.
+ * Checks if this is closing.
*
* @return <tt>true</tt> if we are closing, <tt>false</tt> otherwise.
*/
@@ -90,6 +90,11 @@ public abstract class Closeable
return _closing.get();
}
+ public void resetClosedFlag()
+ {
+ _closed.set(false);
+ }
+
protected boolean setClosed()
{
return _closed.getAndSet(true);
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=1306208&r1=1306207&r2=1306208&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Wed Mar 28 07:58:53 2012
@@ -216,6 +216,7 @@ public class Connection extends Connecti
conSettings = settings;
state = OPENING;
userID = settings.getUsername();
+ connectionLost.set(false);
securityLayer = SecurityLayerFactory.newInstance(getConnectionSettings());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org