summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2008-07-29 16:12:58 +0000
committerAidan Skinner <aidan@apache.org>2008-07-29 16:12:58 +0000
commit2436d8a7656bd0d99007a59a2b219b80f9960dd4 (patch)
treeb31b8037e6ae0d461008fc568eae5cfd952dbcce
parentcc6b09471a907bbe6c94329582c43efe334c9197 (diff)
downloadqpid-python-2436d8a7656bd0d99007a59a2b219b80f9960dd4.tar.gz
QPID-1203 Don't treat protocol negotiation failure as failover reducing error.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@680750 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index bb28e70d76..90dce8eb60 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -411,7 +411,6 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
// We are not currently connected
_connected = false;
- // TMG FIXME this seems... wrong...
boolean retryAllowed = true;
Exception connectionException = null;
while (!_connected && retryAllowed)
@@ -438,10 +437,9 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
// broker
initDelegate(pe);
}
-
- if (!_connected)
+ else if (!_connected)
{
- retryAllowed = _failoverPolicy.failoverAllowed();
+ retryAllowed = _failoverPolicy.failoverAllowed();
brokerDetails = _failoverPolicy.getNextBrokerDetails();
}
}