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

This closes #933

This commit is contained in:
jbertram 2016-12-16 09:06:59 -06:00
parent be38f4dd45 3e0ad2268b
commit 343cdefbd9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2531,10 +2531,16 @@ public class ActiveMQServerImpl implements ActiveMQServer {
AddressInfo info = postOffice.getAddressInfo(addressName); AddressInfo info = postOffice.getAddressInfo(addressName);
if (autoCreateAddress) { if (autoCreateAddress) {
if (info == null || !info.getRoutingTypes().contains(routingType)) { RoutingType rt = (routingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : routingType);
final AddressInfo defaultAddressInfo = new AddressInfo(addressName); if (info == null) {
defaultAddressInfo.addRoutingType(routingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : routingType); final AddressInfo addressInfo = new AddressInfo(addressName, rt);
createOrUpdateAddressInfo(defaultAddressInfo.setAutoCreated(true)); createAddressInfo(addressInfo);
}
else if (!info.getRoutingTypes().contains(routingType)) {
Set<RoutingType> routingTypes = new HashSet<>();
routingTypes.addAll(info.getRoutingTypes());
routingTypes.add(routingType);
updateAddressInfo(info.getName().toString(), routingTypes);
} }
} else if (info == null) { } else if (info == null) {
throw ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(addressName); throw ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(addressName);