Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix shadowing and ensure close of connection, ci...

This commit is contained in:
gtully 2016-05-26 11:30:14 +01:00
parent 62ab55683f
commit 29b833fe8e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
View File

@ -49,7 +49,6 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
private static final int MESSAGE_COUNT = 5;
private static final String MESSAGE_TEXT = "message";
protected ConnectionFactory connectionFactory;
protected Connection connection;
protected Session session;
protected MessageConsumer consumer;
@ -130,6 +129,10 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
try {
session.close();
session = null;
} catch (Exception e) {
LOG.info("Caught exception while closing resources.");
}
try {
connection.close();
connection = null;
} catch (Exception e) {

7
activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java
View File

@ -20,6 +20,7 @@ import java.io.File;
import java.lang.reflect.Array;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
public abstract class TestSupport extends TestCase {
private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected ActiveMQConnectionFactory connectionFactory;
protected ConnectionFactory connectionFactory;
protected boolean topic = true;
public TestSupport() {
@ -184,7 +185,7 @@ public abstract class TestSupport extends TestCase {
* @return ActiveMQConnectionFactory
* @throws Exception
*/
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
protected ConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
}
@ -204,7 +205,7 @@ public abstract class TestSupport extends TestCase {
* @return connectionFactory
* @throws Exception
*/
public ActiveMQConnectionFactory getConnectionFactory() throws Exception {
public ConnectionFactory getConnectionFactory() throws Exception {
if (connectionFactory == null) {
connectionFactory = createConnectionFactory();
assertTrue("Should have created a connection factory!", connectionFactory != null);