[
https://issues.apache.org/jira/browse/ARTEMIS-2238?focusedWorklogId=189775&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-189775
]
ASF GitHub Bot logged work on ARTEMIS-2238:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 25/Jan/19 00:20
Start Date: 25/Jan/19 00:20
Worklog Time Spent: 10m
Work Description: clebertsuconic commented on pull request #2521:
ARTEMIS-2238 Enhancement to queueQuery on producer
URL: https://github.com/apache/activemq-artemis/pull/2521#discussion_r250827739
##########
File path:
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
##########
@@ -409,33 +409,42 @@ private void doSendx(ActiveMQDestination destination,
ClientSession.AddressQuery query =
clientSession.addressQuery(address);
if (!query.isExists()) {
- if (destination.isQueue() && query.isAutoCreateQueues()) {
- clientSession.createAddress(address, RoutingType.ANYCAST,
true);
- if (destination.isTemporary()) {
- // TODO is it right to use the address for the queue
name here?
- session.createTemporaryQueue(destination,
RoutingType.ANYCAST, address, null, query);
+ if (destination.isQueue()) {
+ if (query.isAutoCreateAddresses() &&
query.isAutoCreateQueues()) {
+ clientSession.createAddress(address,
RoutingType.ANYCAST, true);
+ if (destination.isTemporary()) {
+ // TODO is it right to use the address for the
queue name here?
+ session.createTemporaryQueue(destination,
RoutingType.ANYCAST, address, null, query);
+ } else {
+ session.createQueue(destination,
RoutingType.ANYCAST, address, null, true, true, query);
+ }
} else {
- session.createQueue(destination, RoutingType.ANYCAST,
address, null, true, true, query);
+ throw new InvalidDestinationException("JMSQueue " +
address + " cannot be created, autoCreateAddresses is " +
query.isAutoCreateAddresses() + " , isAutoCreateQueues=" +
query.isAutoCreateQueues());
+ }
+ } else {
+ if (query.isAutoCreateAddresses()) {
+ clientSession.createAddress(address,
RoutingType.MULTICAST, true);
+ } else {
+ throw new InvalidDestinationException("JMSTopic " +
address + " cannot be created, autoCreateAddresses is " +
query.isAutoCreateAddresses());
}
- } else if (!destination.isQueue() &&
query.isAutoCreateAddresses()) {
- clientSession.createAddress(address,
RoutingType.MULTICAST, true);
- } else if ((destination.isQueue() &&
!query.isAutoCreateQueues()) || (!destination.isQueue() &&
!query.isAutoCreateAddresses())) {
- throw new InvalidDestinationException("Destination " +
address + " does not exist");
}
} else {
if (destination.isQueue()) {
ClientSession.QueueQuery queueQuery =
clientSession.queueQuery(address);
if (!queueQuery.isExists()) {
- if (destination.isTemporary()) {
- session.createTemporaryQueue(destination,
RoutingType.ANYCAST, address, null, query);
+ if (query.isAutoCreateQueues()) {
+ if (destination.isTemporary()) {
+ session.createTemporaryQueue(destination,
RoutingType.ANYCAST, address, null, query);
+ } else {
+ session.createQueue(destination,
RoutingType.ANYCAST, address, null, true, true, query);
+ }
} else {
- session.createQueue(destination,
RoutingType.ANYCAST, address, null, true, true, query);
+ throw new InvalidDestinationException("JMSQueue " +
address + " cannot be created, address exists but autoCreateQueues is " +
query.isAutoCreateQueues());
Review comment:
for example. another issue on the original code, it's never checking the
destination on a defaultDestination.
small issue, but my change also addressed that.
I don't know what you think, but the code I wrote it's easier to read.
Although I understand your concern as this is the JMS layer, and TCK is
applied here. But I think it's safe to make the change on this case. I would
run the full testsuite,
----------------------------------------------------------------
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:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 189775)
Time Spent: 6h 50m (was: 6h 40m)
> JMS Producer queueQuery does not work when addressName != queueName
> -------------------------------------------------------------------
>
> Key: ARTEMIS-2238
> URL: https://issues.apache.org/jira/browse/ARTEMIS-2238
> Project: ActiveMQ Artemis
> Issue Type: Bug
> Affects Versions: 2.6.4
> Environment: this is a regression created atÂ
> f3ace6afd726dc8e3c1c58c76e3fad3d5cfa357d
> Reporter: clebert suconic
> Priority: Major
> Fix For: 2.7.0, 2.6.5
>
> Time Spent: 6h 50m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
