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/07 13:30:10 UTC
activemq git commit: Ensure that connections get closed to allow the
vm transport resources to get cleaned up.
Repository: activemq
Updated Branches:
refs/heads/master 9079678c3 -> 5fd307cd9
Ensure that connections get closed to allow the vm transport resources
to get cleaned up.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5fd307cd
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5fd307cd
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5fd307cd
Branch: refs/heads/master
Commit: 5fd307cd9f6e8402facb22e22f6239a4b0427ff3
Parents: 9079678
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Jun 7 09:29:41 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Jun 7 09:29:41 2016 -0400
----------------------------------------------------------------------
.../broker/scheduler/JmsCronSchedulerTest.java | 8 ++++++--
.../activemq/broker/scheduler/JmsSchedulerTest.java | 9 ++++-----
.../broker/scheduler/JobSchedulerManagementTest.java | 15 ++++++++++++++-
3 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/5fd307cd/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
index 44ef670..d1315a1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.java
@@ -82,7 +82,7 @@ public class JmsCronSchedulerTest extends JobSchedulerTestSupport {
producer.send(message);
LOG.info("Message {} sent at {}", i, new Date().toString());
producer.close();
- //wait a couple sec so cron start time is different for next message
+ // wait a couple sec so cron start time is different for next message
Thread.sleep(2000);
}
SchedulerBroker sb = (SchedulerBroker) this.broker.getBroker().getAdaptor(SchedulerBroker.class);
@@ -90,8 +90,10 @@ public class JmsCronSchedulerTest extends JobSchedulerTestSupport {
List<Job> list = js.getAllJobs();
assertEquals(COUNT, list.size());
latch.await(2, TimeUnit.MINUTES);
- //All should messages should have been received by now
+ // All should messages should have been received by now
assertEquals(COUNT, count.get());
+
+ connection.close();
}
@Test
@@ -114,5 +116,7 @@ public class JmsCronSchedulerTest extends JobSchedulerTestSupport {
assertNotNull(consumer.receiveNoWait());
assertNull(consumer.receiveNoWait());
+
+ connection.close();
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/5fd307cd/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
index fec03c5..8d5737d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
@@ -220,7 +220,6 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
broker.start();
broker.waitUntilStarted();
-
// consume the message
connection = createConnection();
connection.start();
@@ -244,9 +243,9 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
broker.getSystemUsage().getJobSchedulerUsage().setLimit(10 * 1024);
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
- Connection conn = factory.createConnection();
- conn.start();
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Connection connection = factory.createConnection();
+ connection.start();
+ Session sess = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
final long time = 5000;
final ProducerThread producer = new ProducerThread(sess, destination) {
@Override
@@ -295,6 +294,6 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
latch.await(20000l, TimeUnit.MILLISECONDS);
assertEquals("Consumer did not receive all messages.", 0, latch.getCount());
- conn.close();
+ connection.close();
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/5fd307cd/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
index c82f8ef..c944be3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
@@ -78,6 +78,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
// Now wait and see if any get delivered, none should.
latch.await(10, TimeUnit.SECONDS);
assertEquals(latch.getCount(), COUNT);
+
+ connection.close();
}
@Test
@@ -144,6 +146,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
// Now wait and see if any get delivered, none should.
latch.await(10, TimeUnit.SECONDS);
assertEquals(2, latch.getCount());
+
+ connection.close();
}
@Test
@@ -203,6 +207,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
// now check that they all got delivered
latch.await(10, TimeUnit.SECONDS);
assertEquals(latch.getCount(), 0);
+
+ connection.close();
}
@Test
@@ -270,6 +276,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
// destination.
latch.await(20, TimeUnit.SECONDS);
assertEquals(0, latch.getCount());
+
+ connection.close();
}
@Test
@@ -327,6 +335,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
// now check that they all got removed and are not delivered.
latch.await(11, TimeUnit.SECONDS);
assertEquals(COUNT, latch.getCount());
+
+ connection.close();
}
@Test
@@ -341,7 +351,6 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
MessageProducer producer = session.createProducer(management);
try {
-
// Send the remove request
Message remove = session.createMessage();
remove.setStringProperty(ScheduledMessage.AMQ_SCHEDULER_ACTION, ScheduledMessage.AMQ_SCHEDULER_ACTION_REMOVEALL);
@@ -349,6 +358,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
producer.send(remove);
} catch (Exception e) {
fail("Caught unexpected exception during remove of unscheduled message.");
+ } finally {
+ connection.close();
}
}
@@ -388,6 +399,8 @@ public class JobSchedulerManagementTest extends JobSchedulerTestSupport {
// Now check if there are anymore, there shouldn't be
message = browser.receive(5000);
assertNull(message);
+
+ connection.close();
}
protected void scheduleMessage(Connection connection, long delay) throws Exception {