Fix PlainTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/74a3738e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/74a3738e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/74a3738e Branch: refs/heads/ARTEMIS-780 Commit: 74a3738effa3ed2b778579a53e64294f9b6455ee Parents: f51f435 Author: jbertram <[email protected]> Authored: Mon Nov 14 12:11:56 2016 -0600 Committer: jbertram <[email protected]> Committed: Tue Nov 15 10:36:42 2016 -0600 ---------------------------------------------------------------------- .../artemis/jms/client/ActiveMQSession.java | 24 ++++---------------- 1 file changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74a3738e/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java ---------------------------------------------------------------------- diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java index acbb5e9..c115614 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java @@ -299,28 +299,14 @@ public class ActiveMQSession implements QueueSession, TopicSession { if (jbd != null) { ClientSession.AddressQuery response = session.addressQuery(jbd.getSimpleAddress()); - if (!response.isExists() && response.isAutoCreateJmsQueues()) { - if (jbd.isQueue()) { + if (!response.isExists()) { + if (jbd.isQueue() && response.isAutoCreateJmsQueues()) { session.createAddress(jbd.getSimpleAddress(), false, true); session.createQueue(jbd.getSimpleAddress(), jbd.getSimpleAddress(), null, true); - } else { + } else if (!jbd.isQueue() && response.isAutoCreateJmsTopics()) { session.createAddress(jbd.getSimpleAddress(), true, true); - } - - if (response.getQueueNames().isEmpty()) { - if (response.isAutoCreateJmsQueues()) { - session.createQueue(jbd.getSimpleAddress(), jbd.getSimpleAddress(), null, true); - } else { - throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist"); - } - } - } else { - if (!response.isExists()) { - if (response.isAutoCreateJmsTopics()) { - session.createAddress(jbd.getSimpleAddress(), true, true); - } else { - throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist"); - } + } else { + throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist"); } } }
