summaryrefslogtreecommitdiff
path: root/java
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
commit3f14891fcac6df559a39e259b8167966a0450a29 (patch)
tree6d2c8bfda633ae638d49aa32fd341c8ed00e47b4 /java
parentef4336479e0d6bba3ae06d623dd40836e9043d0b (diff)
downloadqpid-python-3f14891fcac6df559a39e259b8167966a0450a29.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/qpid@680750 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQConnection.java6
1 files changed, 2 insertions, 4 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 bb28e70d76..90dce8eb60 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
@@ -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();
}
}