svn commit: r680750 - /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java

[aidan]

Author: aidan
Date: Tue Jul 29 09:12:58 2008
New Revision: 680750

URL: http://svn.apache.org/viewvc?rev=680750&view=rev
Log:
QPID-1203 Don't treat protocol negotiation failure as failover reducing error.

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=680750&r1=680749&r2=680750&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 Tue Jul 29 09:12:58 2008
@@ -411,7 +411,6 @@
         // 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 @@
                 // broker
                 initDelegate(pe);
             }
-
-            if (!_connected)
+            else if (!_connected)
             {
-                retryAllowed = _failoverPolicy.failoverAllowed();
+                retryAllowed = _failoverPolicy.failoverAllowed(); 
                 brokerDetails = _failoverPolicy.getNextBrokerDetails();
             }
         }