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

ARTEMIS-4016 fixing tests

This commit is contained in:
Justin Bertram 2022-12-21 11:42:08 -06:00
parent bf1d81e09e
commit c354c8e642
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -4579,13 +4579,18 @@ public class ActiveMQServerImpl implements ActiveMQServer {
deployBridge(newBridgeConfig);
}
}
for (final Bridge runningBridge: clusterManager.getBridges().values()) {
List<BridgeConfiguration> newConfig = configuration.getBridgeConfigurations();
BridgeConfiguration running = new BridgeConfiguration(runningBridge.getConfiguration());
running.set("name", running.getParentName());
if (!configuration.getBridgeConfigurations().contains(running) && running.isConfigurationManaged()) {
for (final Bridge existingBridge: clusterManager.getBridges().values()) {
BridgeConfiguration existingBridgeConfig = existingBridge.getConfiguration();
boolean destroy = true;
for (final BridgeConfiguration newBridgeConfig : configuration.getBridgeConfigurations()) {
if (existingBridgeConfig.isConfigurationManaged() && (existingBridgeConfig.getParentName().equals(newBridgeConfig.getName()) || existingBridgeConfig.getName().equals(newBridgeConfig.getName()) )) {
destroy = false;
break;
}
}
if (destroy) {
// this bridge is running but it isn't in the new config which means it was removed so destroy it
destroyBridge(runningBridge.getName().toString());
destroyBridge(existingBridge.getConfiguration().getParentName());
}
}
recoverStoredBridges();

1
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/BridgeConfigurationStorageTest.java
View File

@ -93,6 +93,7 @@ public class BridgeConfigurationStorageTest extends StorageManagerTestBase {
BridgeConfiguration configuration = new BridgeConfiguration();
configuration.setName("name");
configuration.setParentName("name");
configuration.setQueueName("QueueName");
configuration.setConcurrency(2);
configuration.setForwardingAddress("forward");