You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2016/06/15 23:15:30 UTC
activemq git commit: Do a bit more resource cleanup on tearDown
Repository: activemq
Updated Branches:
refs/heads/master f595f3c20 -> 0b65c8d93
Do a bit more resource cleanup on tearDown
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0b65c8d9
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0b65c8d9
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0b65c8d9
Branch: refs/heads/master
Commit: 0b65c8d93c860124d3900dd39885768b7d867b41
Parents: f595f3c
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Jun 15 19:15:21 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Jun 15 19:15:21 2016 -0400
----------------------------------------------------------------------
.../activemq/ra/JmsXARollback2CxTransactionTest.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/0b65c8d9/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
----------------------------------------------------------------------
diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
index 658cd99..732da9e 100644
--- a/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
+++ b/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
@@ -41,6 +41,7 @@ public class JmsXARollback2CxTransactionTest extends JmsQueueTransactionTest {
private static final String DEFAULT_HOST = "vm://localhost?create=false";
+ private ManagedConnectionProxy cx2;
private ConnectionManagerAdapter connectionManager = new ConnectionManagerAdapter();
private static long txGenerator;
private Xid xid;
@@ -54,6 +55,15 @@ public class JmsXARollback2CxTransactionTest extends JmsQueueTransactionTest {
}
@Override
+ protected void tearDown() throws Exception {
+ if (cx2 != null) {
+ cx2.close();
+ }
+
+ super.tearDown();
+ }
+
+ @Override
protected void setSessionTransacted() {
resourceProvider.setTransacted(false);
resourceProvider.setAckMode(Session.AUTO_ACKNOWLEDGE);
@@ -90,7 +100,7 @@ public class JmsXARollback2CxTransactionTest extends JmsQueueTransactionTest {
protected void reconnect() throws Exception {
super.reconnect();
xares[0] = getXAResource(connection);
- ManagedConnectionProxy cx2 = (ManagedConnectionProxy) connectionFactory.createConnection();
+ cx2 = (ManagedConnectionProxy) connectionFactory.createConnection();
xares[1] = getXAResource(cx2);
}