Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-16 23:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1518171 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2013-08-28 11:48:15 +00:00
parent f66e9a1f16
commit 65ba623c96
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -195,7 +195,7 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
}
}
}
if (!stopping.get()) {
if (!stopping.get() && !pendingStop) {
transportException.set(e);
if (TRANSPORTLOG.isDebugEnabled()) {
TRANSPORTLOG.debug(this + " failed: " + e, e);

1
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
View File

@ -53,6 +53,7 @@ public class AMQ2902Test extends TestCase {
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) {