michaelandrepearce commented on a change in pull request #2520: ARTEMIS-2238 Enhancement to queueQuery on producer URL: https://github.com/apache/activemq-artemis/pull/2520#discussion_r250814957
########## File path: artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java ########## @@ -533,6 +499,67 @@ private void doSendx(ActiveMQDestination destination, } } + private void checkDestination(ActiveMQDestination destination, + SimpleString address, + ClientSession clientSession) throws JMSException { + + // TODO: What to do with FQQN + if (!connection.containsKnownDestination(address)) { + try { + ClientSession.AddressQuery addressQuery = clientSession.addressQuery(address); + + boolean addressExists = addressQuery.isExists(); + // first we check the address existence, and autoCreate it if allowed in case it does not exists + + if (!addressExists && addressQuery.isAutoCreateAddresses()) { + + if (destination.isQueue() && !addressQuery.isAutoCreateQueues()) { + if (logger.isDebugEnabled()) { + logger.debug("Address " + address + " was not created because we would not have permission to create queue"); + } + // if it can't create the internal queue on JMS Queues, why bother creating the address, just mark it false now + addressExists = false; + } else { + RoutingType addressType = destination.isQueue() ? RoutingType.ANYCAST : RoutingType.MULTICAST; + clientSession.createAddress(address, addressType, true); + addressExists = true; + } + } + + + // Second we create the queue, but we only do it if the address was created + if (destination.isQueue() && addressExists) { + ClientSession.QueueQuery queueQuery = clientSession.queueQuery(address); + if (!queueQuery.isExists()) { + if (addressQuery.isAutoCreateQueues()) { + try { + if (destination.isTemporary()) { + session.createTemporaryQueue(destination, RoutingType.ANYCAST, address, null, addressQuery); + } else { + session.createQueue(destination, RoutingType.ANYCAST, address, null, true, true, addressQuery); + } + } catch (ActiveMQQueueExistsException thatsOK) { + // nothing to be done + } + } else { + throw new InvalidDestinationException("Queue " + address + " does not exist"); + } + } + } + + if (!addressExists) { Review comment: -1 lets keep that exceptions are thrown from explicit points where checks are done and fail, so can be more explicit and also we can debug where the check fail occured by stack trace lines. also general comment as this is JMS interface, we should use words like Queue, Topic or Destination ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services