activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1211844 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
Date Thu, 08 Dec 2011 11:44:36 GMT
Author: gtully
Date: Thu Dec  8 11:44:36 2011
New Revision: 1211844

URL: http://svn.apache.org/viewvc?rev=1211844&view=rev
Log:
tidy up fix (exception was being lost) for URL: http://svn.apache.org/viewvc?rev=1209841&view=rev
Only stop transport for java.lang.SecurityException - as some tests rely on Connection continung
after an exception from the broker
related to changes in support of fix for https://issues.apache.org/jira/browse/AMQ-3294 and
https://issues.apache.org/jira/browse/AMQ-1928

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

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=1211844&r1=1211843&r2=1211844&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
Thu Dec  8 11:44:36 2011
@@ -1303,8 +1303,8 @@ public class ActiveMQConnection implemen
                         }
                         JMSException jmsEx = null;
                         try {
-                         jmsEx = JMSExceptionSupport.create(er.getException());
-                        }catch(Throwable e) {
+                            jmsEx = JMSExceptionSupport.create(er.getException());
+                        } catch(Throwable e) {
                             LOG.error("Caught an exception trying to create a JMSException
for " +er.getException(),e);
                         }
                         //dispose of transport for security exceptions
@@ -1313,9 +1313,9 @@ public class ActiveMQConnection implemen
                             if (null != t){
                                 ServiceSupport.dispose(t);
                             }
-                            if(jmsEx !=null) {
-                                throw jmsEx;
-                            }
+                        }
+                        if (jmsEx !=null) {
+                            throw jmsEx;
                         }
                     }
                 }



Mime
View raw message