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

ARTEMIS-4162 Remove EMPTY_ROUTING_TYPES from AddressInfo 

I have seen a werid intermittent failure in the testsuite
caused by some race where the EMPTY_SET ends up Not Empty! Causing weird failures that were really difficult to be investigated
This commit is contained in:
Clebert Suconic 2023-03-10 04:35:48 -05:00 committed by clebertsuconic
parent 648faf58cc
commit 294daa0ff6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
View File

@ -59,8 +59,13 @@ public class AddressInfo {
private volatile boolean temporary = false;
private static final EnumSet<RoutingType> EMPTY_ROUTING_TYPES = EnumSet.noneOf(RoutingType.class);
private EnumSet<RoutingType> routingTypes;
// Do not be tempted to cache this on an static variable.
// if the empty set gets damaged in any race, the results and unpredictable
private static EnumSet<RoutingType> createEmptySet() {
return EnumSet.noneOf(RoutingType.class);
}
EnumSet<RoutingType> routingTypes;
private RoutingType firstSeen;
private boolean internal = false;
@ -97,11 +102,11 @@ public class AddressInfo {
}
public AddressInfo(String name) {
this(SimpleString.toSimpleString(name), EMPTY_ROUTING_TYPES);
this(SimpleString.toSimpleString(name), createEmptySet());
}
public AddressInfo(SimpleString name) {
this(name, EMPTY_ROUTING_TYPES);
this(name, createEmptySet());
}
/**
@ -157,7 +162,7 @@ public class AddressInfo {
}
public EnumSet<RoutingType> getRoutingTypes() {
return routingTypes == null ? EMPTY_ROUTING_TYPES : routingTypes;
return routingTypes == null ? createEmptySet() : routingTypes;
}
public AddressInfo setRoutingTypes(final EnumSet<RoutingType> routingTypes) {