activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1518171 - in /activemq/trunk: activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
Date Wed, 28 Aug 2013 11:48:15 GMT
Author: gtully
Date: Wed Aug 28 11:48:15 2013
New Revision: 1518171

URL: http://svn.apache.org/r1518171
Log:
https://issues.apache.org/jira/browse/AMQ-2902 - resolve intermittent test failure when stop
ocurrs while start is in progress

Modified:
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java

Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1518171&r1=1518170&r2=1518171&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
(original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
Wed Aug 28 11:48:15 2013
@@ -195,7 +195,7 @@ public class TransportConnection impleme
                 }
             }
         }
-        if (!stopping.get()) {
+        if (!stopping.get() && !pendingStop) {
             transportException.set(e);
             if (TRANSPORTLOG.isDebugEnabled()) {
                 TRANSPORTLOG.debug(this + " failed: " + e, e);

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java?rev=1518171&r1=1518170&r2=1518171&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
(original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
Wed Aug 28 11:48:15 2013
@@ -53,6 +53,7 @@ public class AMQ2902Test extends TestCas
 
                 gotExceptionInLog.set(Boolean.TRUE);
                 LOG.error("got event: " + event + ", ex:" + event.getThrowableInformation().getThrowable(),
event.getThrowableInformation().getThrowable());
+                LOG.error("Event source: ", new Throwable("Here"));
             }
             if( !"Loaded the Bouncy Castle security provider.".equals(event.getMessage())
) {
                 if (event.getMDC("activemq.broker") == null) {



Mime
View raw message