You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2018/08/30 20:36:19 UTC
activemq-artemis git commit: Fix compilation issue from cherry-pick
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x 715689efa -> f9fa6cb88
Fix compilation issue from cherry-pick
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f9fa6cb8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f9fa6cb8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f9fa6cb8
Branch: refs/heads/2.6.x
Commit: f9fa6cb88e6e3ceca2da1c3d1b0824ffbb615ada
Parents: 715689e
Author: Justin Bertram <jb...@apache.org>
Authored: Thu Aug 30 15:36:01 2018 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu Aug 30 15:36:01 2018 -0500
----------------------------------------------------------------------
.../tests/integration/jms/RedeployTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f9fa6cb8/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
index fb7e20f..126534e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
@@ -270,9 +270,9 @@ public class RedeployTest extends ActiveMQTestBase {
URL url2 = RedeployTest.class.getClassLoader().getResource("reload-queue-routingtype-updated.xml");
Files.copy(url1.openStream(), brokerXML);
- EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ();
- embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString());
- embeddedActiveMQ.start();
+ EmbeddedJMS embeddedJMS = new EmbeddedJMS();
+ embeddedJMS.setConfigResourcePath(brokerXML.toUri().toString());
+ embeddedJMS.start();
final ReusableLatch latch = new ReusableLatch(1);
@@ -283,23 +283,23 @@ public class RedeployTest extends ActiveMQTestBase {
}
};
- embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+ embeddedJMS.getActiveMQServer().getReloadManager().setTick(tick);
try {
latch.await(10, TimeUnit.SECONDS);
- Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "myAddress"));
- Assert.assertEquals(RoutingType.MULTICAST, getQueue(embeddedActiveMQ, "myQueue").getRoutingType());
+ Assert.assertNotNull(getAddressInfo(embeddedJMS, "myAddress"));
+ Assert.assertEquals(RoutingType.MULTICAST, getQueue(embeddedJMS, "myQueue").getRoutingType());
Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING);
brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000);
latch.setCount(1);
- embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+ embeddedJMS.getActiveMQServer().getReloadManager().setTick(tick);
latch.await(10, TimeUnit.SECONDS);
- Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "myAddress"));
- Assert.assertEquals(RoutingType.ANYCAST, getQueue(embeddedActiveMQ, "myQueue").getRoutingType());
+ Assert.assertNotNull(getAddressInfo(embeddedJMS, "myAddress"));
+ Assert.assertEquals(RoutingType.ANYCAST, getQueue(embeddedJMS, "myQueue").getRoutingType());
} finally {
- embeddedActiveMQ.stop();
+ embeddedJMS.stop();
}
}