You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/04 00:16:56 UTC

svn commit: r382960 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java

Author: chirino
Date: Fri Mar  3 15:16:53 2006
New Revision: 382960

URL: http://svn.apache.org/viewcvs?rev=382960&view=rev
Log:
No need to clean up connection if it's being closed.

Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=382960&r1=382959&r2=382960&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Fri Mar  3 15:16:53 2006
@@ -1580,12 +1580,13 @@
     
     protected void transportFailed(Throwable error){
         transportFailed.set(true);
-        try{
-            cleanup();
-        }catch(JMSException e){
-           log.warn("Cleanup failed",e);
+        if (!closed.get() && !closing.get()) {
+            try{
+                cleanup();
+            }catch(JMSException e){
+               log.warn("Cleanup failed",e);
+            }
         }
-        
     }
 
     public void setCopyMessageOnSend(boolean copyMessageOnSend) {