This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit fdc0cc591c9ab9dea22a9b65cef6c53ea0263222 Author: Clebert Suconic <[email protected]> AuthorDate: Thu Oct 21 13:19:39 2021 -0400 ARTEMIS-3523 Small tweaks into AddressControl delegation --- .../activemq/artemis/core/server/replay/ReplayManager.java | 8 +++++++- .../tests/integration/management/AddressControlTest.java | 13 ++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java index a13609e..1906f47 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java @@ -84,7 +84,7 @@ public class ReplayManager { } } - private void actualReplay(Date start, Date end, String sourceAddress, String targetAddress, String filterStr) throws Exception { + private void actualReplay(Date start, Date end, String sourceAddress, String targetAddressParameter, String filterStr) throws Exception { if (logger.isDebugEnabled()) { logger.debug("Replay::" + sourceAddress); } @@ -92,6 +92,12 @@ public class ReplayManager { throw new NullPointerException("sourceAddress"); } + if (targetAddressParameter == null || targetAddressParameter.trim().isEmpty()) { + targetAddressParameter = sourceAddress; + } + + final String targetAddress = targetAddressParameter; + if (journal == null) { // notice this routing plays single threaded. no need for any sort of synchronization here journal = (JournalImpl)server.getStorageManager().getMessageJournal(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java index a303ad6..21dbb6a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java @@ -363,7 +363,6 @@ public class AddressControlTest extends ManagementTestBase { ClientSessionFactory sf2 = createSessionFactory(locator2); session = sf2.createSession(false, true, false); - session.createQueue(new QueueConfiguration(address)); Assert.assertEquals(1024, addressControl.getNumberOfBytesPerPage()); } @@ -601,12 +600,11 @@ public class AddressControlTest extends ManagementTestBase { } private void testReplaySimple(boolean useDate) throws Exception { - SimpleString address = RandomUtil.randomSimpleString(); - AddressControl addressControl = createManagementControl(address); String queue = "testQueue" + RandomUtil.randomString(); server.addAddressInfo(new AddressInfo(queue).addRoutingType(RoutingType.ANYCAST)); server.createQueue(new QueueConfiguration(queue).setRoutingType(RoutingType.ANYCAST).setAddress(queue)); + AddressControl addressControl = createManagementControl(SimpleString.toSimpleString(queue)); ConnectionFactory factory = CFUtil.createConnectionFactory("core", "tcp://localhost:61616"); try (Connection connection = factory.createConnection()) { @@ -661,13 +659,13 @@ public class AddressControlTest extends ManagementTestBase { @Test public void testReplayFilter() throws Exception { - SimpleString address = RandomUtil.randomSimpleString(); - AddressControl addressControl = createManagementControl(address); String queue = "testQueue" + RandomUtil.randomString(); server.addAddressInfo(new AddressInfo(queue).addRoutingType(RoutingType.ANYCAST)); server.createQueue(new QueueConfiguration(queue).setRoutingType(RoutingType.ANYCAST).setAddress(queue)); + AddressControl addressControl = createManagementControl(SimpleString.toSimpleString(queue)); + ConnectionFactory factory = CFUtil.createConnectionFactory("core", "tcp://localhost:61616"); try (Connection connection = factory.createConnection()) { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -704,8 +702,9 @@ public class AddressControlTest extends ManagementTestBase { public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultInVMConfig().setJMXManagementEnabled(true); - server = createServer(false, config); + Configuration config = createDefaultNettyConfig().setJMXManagementEnabled(true); + config.setJournalRetentionDirectory(config.getJournalDirectory() + "_ret"); // needed for replay tests + server = createServer(true, config); server.setMBeanServer(mbeanServer); server.start();
