jbertram commented on code in PR #4421: URL: https://github.com/apache/activemq-artemis/pull/4421#discussion_r1161863938
########## artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V5.java: ########## @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; + +import java.util.List; + +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.utils.BufferHelper; + +public class SessionBindingQueryResponseMessage_V5 extends SessionBindingQueryResponseMessage_V4 { + + protected Boolean supportsMulticast; + + protected Boolean supportsAnycast; + + public SessionBindingQueryResponseMessage_V5(final boolean exists, + final List<SimpleString> queueNames, + final boolean autoCreateQueues, + final boolean autoCreateAddresses, + final boolean defaultPurgeOnNoConsumers, + final int defaultMaxConsumers, + final Boolean defaultExclusive, + final Boolean defaultLastValue, + final SimpleString defaultLastValueKey, + final Boolean defaultNonDestructive, + final Integer defaultConsumersBeforeDispatch, + final Long defaultDelayBeforeDispatch, + final Boolean supportsMulticast, + final Boolean supportsAnycast) { + super(SESS_BINDINGQUERY_RESP_V5); + + this.exists = exists; + + this.queueNames = queueNames; + + this.autoCreateQueues = autoCreateQueues; + + this.autoCreateAddresses = autoCreateAddresses; + + this.defaultPurgeOnNoConsumers = defaultPurgeOnNoConsumers; + + this.defaultMaxConsumers = defaultMaxConsumers; + + this.defaultExclusive = defaultExclusive; + + this.defaultLastValue = defaultLastValue; + + this.defaultLastValueKey = defaultLastValueKey; + + this.defaultNonDestructive = defaultNonDestructive; + + this.defaultConsumersBeforeDispatch = defaultConsumersBeforeDispatch; + + this.defaultDelayBeforeDispatch = defaultDelayBeforeDispatch; + + this.supportsMulticast = supportsMulticast; + + this.supportsAnycast = supportsAnycast; + } + + public SessionBindingQueryResponseMessage_V5() { + super(SESS_BINDINGQUERY_RESP_V5); + } + + public Boolean isSupportsMulticast() { + return supportsMulticast; + } + + public Boolean isSupportsAnycast() { + return supportsAnycast; + } + + @Override + public void encodeRest(final ActiveMQBuffer buffer) { + super.encodeRest(buffer); + BufferHelper.writeNullableBoolean(buffer, supportsMulticast); + BufferHelper.writeNullableBoolean(buffer, supportsAnycast); + } + + @Override + public void decodeRest(final ActiveMQBuffer buffer) { + super.decodeRest(buffer); + if (buffer.readableBytes() > 0) { + supportsMulticast = BufferHelper.readNullableBoolean(buffer); + supportsAnycast = BufferHelper.readNullableBoolean(buffer); + } + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + (supportsMulticast == null ? 0 : supportsMulticast ? 1231 : 1237); + result = prime * result + (supportsAnycast == null ? 0 : supportsAnycast ? 1231 : 1237); + return result; + } + + @Override + protected String getPacketString() { + StringBuffer buff = new StringBuffer(super.getPacketString()); + buff.append(", supportsMulticast=" + supportsMulticast); + buff.append(", supportsAnycast=" + supportsAnycast); + return buff.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (!(obj instanceof SessionBindingQueryResponseMessage_V5)) + return false; + SessionBindingQueryResponseMessage_V5 other = (SessionBindingQueryResponseMessage_V5) obj; + if (supportsMulticast == null) { + if (other.supportsMulticast != null) + return false; + } else if (!supportsMulticast.equals(other.supportsMulticast)) + return false; Review Comment: Fixed. ########## artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java: ########## @@ -899,36 +895,21 @@ public boolean sendCommand(final Command command) { } public void addDestination(DestinationInfo info) throws Exception { - boolean created = false; + boolean created; ActiveMQDestination dest = info.getDestination(); if (!protocolManager.isSupportAdvisory() && AdvisorySupport.isAdvisoryTopic(dest)) { return; } SimpleString qName = SimpleString.toSimpleString(dest.getPhysicalName()); - if (server.locateQueue(qName) == null) { - AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch(dest.getPhysicalName()); - if (dest.isQueue() && (addressSettings.isAutoCreateQueues() || dest.isTemporary())) { - try { - internalSession.createQueue(new QueueConfiguration(qName).setRoutingType(RoutingType.ANYCAST).setDurable(!dest.isTemporary()).setTemporary(dest.isTemporary()).setAutoCreated(!dest.isTemporary())); - created = true; - } catch (ActiveMQQueueExistsException exists) { - // The queue may have been created by another thread in the mean time. Catch and do nothing. - } - } else if (dest.isTopic() && (addressSettings.isAutoCreateAddresses() || dest.isTemporary())) { - try { - AddressInfo addressInfo = new AddressInfo(qName, RoutingType.MULTICAST); - if (AdvisorySupport.isAdvisoryTopic(dest) && protocolManager.isSuppressInternalManagementObjects()) { - addressInfo.setInternal(true); - } - if (internalSession.getAddress(addressInfo.getName()) == null) { - internalSession.createAddress(addressInfo, !dest.isTemporary()); - created = true; - } - } catch (ActiveMQAddressExistsException exists) { - // The address may have been created by another thread in the mean time. Catch and do nothing. - } + + if (internalSession.checkAutoCreate(new QueueConfiguration(qName).setRoutingType(dest.isQueue() ? RoutingType.ANYCAST : RoutingType.MULTICAST).setTemporary(dest.isTemporary())) == AutoCreateResult.CREATED) { + created = true; + if (AdvisorySupport.isAdvisoryTopic(dest) && protocolManager.isSuppressInternalManagementObjects()) { + internalSession.getAddress(qName).setInternal(true); } + } else { + throw ActiveMQMessageBundle.BUNDLE.noSuchQueue(SimpleString.toSimpleString(dest.getPhysicalName())); Review Comment: Fixed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
