diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2009-09-22 22:17:36 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2009-09-22 22:17:36 +0000 |
| commit | 0358e70bf5fa052b15c9d10d4f17310b7cfa6af1 (patch) | |
| tree | 316872fc01d18d097e92f2d33573d1cdae9cb8f8 /java/client/src | |
| parent | 642183fb8a6eb1a8adc71acfd2117bfcbdba3546 (diff) | |
| download | qpid-python-0358e70bf5fa052b15c9d10d4f17310b7cfa6af1.tar.gz | |
This is related to QPID-1956
I had missed this bit when I committed last night.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817867 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/AMQConnection.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index 0d2adcec8a..5659ce0474 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java @@ -450,7 +450,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect } else { - // use the defaul value set for all connections + // use the default value set for all connections _syncPublish = System.getProperty((ClientProperties.SYNC_ACK_PROP_NAME),_syncPublish); } @@ -512,7 +512,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect boolean retryAllowed = true; Exception connectionException = null; - while (!_connected && retryAllowed) + while (!_connected && retryAllowed && brokerDetails != null) { ProtocolVersion pe = null; try @@ -691,12 +691,12 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect public boolean attemptReconnection() { - while (_failoverPolicy.failoverAllowed()) + BrokerDetails broker = null; + while (_failoverPolicy.failoverAllowed() && (broker = _failoverPolicy.getNextBrokerDetails()) != null) { try { - makeBrokerConnection(_failoverPolicy.getNextBrokerDetails()); - + makeBrokerConnection(broker); return true; } catch (Exception e) |