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

ARTEMIS-2819 Proper fix (previous fix was breaking the testsuite)

This commit is contained in:
Clebert Suconic 2020-06-28 11:40:50 -04:00
parent cc7c3d3721
commit 51d1ed4e11
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java
View File

@ -304,7 +304,7 @@ public class HierarchicalObjectRepository<T> implements HierarchicalRepository<T
clearCache(); clearCache();
wildcardMatches.remove(modMatch); wildcardMatches.remove(modMatch);
} else { } else {
cache.remove(modMatch); clearCache();
exactMatches.remove(modMatch); exactMatches.remove(modMatch);
} }
onChange(); onChange();

6
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
View File

@ -1313,7 +1313,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
public void testRemoveAddressSettingsEffective() throws Exception { public void testRemoveAddressSettingsEffective() throws Exception {
ActiveMQServerControl serverControl = createManagementControl(); ActiveMQServerControl serverControl = createManagementControl();
String addr = "test"; String addr = "test";
String root = "#"; String root = "test.#";
String DLA = "someDLA"; String DLA = "someDLA";
String expiryAddress = "someExpiry"; String expiryAddress = "someExpiry";
@ -1322,8 +1322,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
long maxExpiryDelay = 20000; long maxExpiryDelay = 20000;
boolean lastValueQueue = true; boolean lastValueQueue = true;
int deliveryAttempts = 1; int deliveryAttempts = 1;
long maxSizeBytes = 20; long maxSizeBytes = 10 * 1024 * 1024;
int pageSizeBytes = 10; int pageSizeBytes = 1024 * 1024;
int pageMaxCacheSize = 7; int pageMaxCacheSize = 7;
long redeliveryDelay = 4; long redeliveryDelay = 4;
double redeliveryMultiplier = 1; double redeliveryMultiplier = 1;