Fix NonExistentQueueTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6afbae76 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6afbae76 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6afbae76 Branch: refs/heads/ARTEMIS-780 Commit: 6afbae762b51d3958965cb0917a58c06a6b8dda7 Parents: 3bd5705 Author: jbertram <[email protected]> Authored: Mon Nov 14 17:04:51 2016 -0600 Committer: jbertram <[email protected]> Committed: Tue Nov 15 10:38:13 2016 -0600 ---------------------------------------------------------------------- .../artemis/jms/client/ActiveMQMessageProducer.java | 4 ++-- .../jms/jms2client/NonExistentQueueTest.java | 16 +--------------- 2 files changed, 3 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afbae76/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java ---------------------------------------------------------------------- diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java index 1270c19..5cbd40f 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java @@ -414,9 +414,9 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To } } else if (!destination.isQueue() && query.isAutoCreateJmsTopics()) { clientSession.createAddress(address, true, true); + } else if ((destination.isQueue() && !query.isAutoCreateJmsQueues()) || (!destination.isQueue() && !query.isAutoCreateJmsTopics())) { + throw new InvalidDestinationException("Destination " + address + " does not exist"); } - } else if (!query.isExists() && ((destination.isQueue() && !query.isAutoCreateJmsQueues()) || (!destination.isQueue() && !query.isAutoCreateJmsTopics()))) { - throw new InvalidDestinationException("Destination " + address + " does not exist"); } else { connection.addKnownDestination(address); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afbae76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java index 88dc68b..64d2af3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java @@ -25,9 +25,7 @@ import javax.jms.JMSException; import javax.jms.JMSProducer; import javax.jms.JMSRuntimeException; import javax.jms.MessageProducer; -import javax.jms.Queue; import javax.jms.Session; -import java.util.Random; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; @@ -36,26 +34,14 @@ import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; public class NonExistentQueueTest extends JMSTestBase { - private JMSContext context; - private final Random random = new Random(); - private Queue queue; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - context = createContext(); - queue = createQueue(JmsContextTest.class.getSimpleName() + "Queue1"); - } - @Test public void sendToNonExistentDestination() throws Exception { server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false)); + server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false)); Destination destination = ActiveMQJMSClient.createTopic("DoesNotExist"); TransportConfiguration transportConfiguration = new TransportConfiguration(InVMConnectorFactory.class.getName()); ConnectionFactory localConnectionFactory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, transportConfiguration);
