activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r646354 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Date Wed, 09 Apr 2008 13:56:50 GMT
Author: rajdavies
Date: Wed Apr  9 06:56:47 2008
New Revision: 646354

URL: http://svn.apache.org/viewvc?rev=646354&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1451

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?rev=646354&r1=646353&r2=646354&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Wed Apr  9 06:56:47 2008
@@ -198,7 +198,7 @@
             synchronized (reconnectMutex) {
                 boolean reconnectOk = false;
                 if(started) {
-                    LOG.warn("Transport failed, attempting to automatically reconnect due
to: " + e);
+                    LOG.warn("Transport failed to " + connectedTransportURI+ " , attempting
to automatically reconnect due to: " + e);
                     LOG.debug("Transport failed with the following exception:", e);
                     reconnectOk = true;
                 }
@@ -207,7 +207,6 @@
                 failedConnectTransportURI=connectedTransportURI;
                 connectedTransportURI = null;
                 connected=false;
-                    
                 if(reconnectOk) {
                     reconnectTask.wakeup();
                 }
@@ -396,7 +395,9 @@
 
                         // Wait for transport to be connected.
                         Transport transport = connectedTransport.get();
-                        while (transport == null && !disposed && connectionFailure
== null) {
+                        while (transport == null && !disposed
+                                && connectionFailure == null
+                                && !Thread.currentThread().isInterrupted()) {
                             LOG.trace("Waiting for transport to reconnect.");
                             try {
                                 reconnectMutex.wait(1000);



Mime
View raw message