You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2014/05/02 19:17:35 UTC
git commit: fix shutdown order on close - broker may be gone before
client
Repository: activemq
Updated Branches:
refs/heads/trunk 4215db2f2 -> 89e876797
fix shutdown order on close - broker may be gone before client
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/89e87679
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/89e87679
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/89e87679
Branch: refs/heads/trunk
Commit: 89e8767973e84828d1c5513884b0b8eeaa895aa4
Parents: 4215db2
Author: gtully <ga...@gmail.com>
Authored: Fri May 2 18:17:04 2014 +0100
Committer: gtully <ga...@gmail.com>
Committed: Fri May 2 18:17:04 2014 +0100
----------------------------------------------------------------------
.../org/apache/activemq/broker/policy/SecureDLQTest.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/89e87679/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
index 9d656e8..354031e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
@@ -95,13 +95,10 @@ public class SecureDLQTest extends DeadLetterTestSupport {
@Override
public void tearDown() throws Exception {
- super.tearDown();
- if (dlqSession != null) {
- dlqSession.close();
- }
- if (dlqConsumer != null) {
- dlqConsumer.close();
+ if (dlqConnection != null) {
+ dlqConnection.close();
}
+ super.tearDown();
}
@Override