From 7c39643f218f7169bae9e7e4581e6a92d5c50c34 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 13 Aug 2010 12:26:21 +0000 Subject: Don't do create-if-not-exist when using the jms:jndi: url format, and don't wrap jms exceptions in another jms exception git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@985173 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java') diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java index 2f5d2e2632..aca0d58697 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java @@ -73,6 +73,7 @@ public class DefaultJMSServiceListener implements JMSServiceListener { try { registerListerner(); } catch (Exception e) { + if (e instanceof JMSBindingException) throw (JMSBindingException)e; throw new JMSBindingException("Error starting JMSServiceBinding", e); } } @@ -188,7 +189,8 @@ public class DefaultJMSServiceListener implements JMSServiceListener { } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) { // In this mode, the queue may nor may not exist. It will be created if it does not exist - if (destination == null) { + // but don't create when using jms:jndi uri format + if (destination == null && !"jndi".equals(jmsBinding.getDestinationType())) { destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName()); } -- cgit v1.2.3