From b6715ee3e9048154c28e62dda28df390afaea724 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 12 Feb 2009 22:56:42 +0000 Subject: TUSCANY-2836 remove DEFAULT_DESTINATION_NAME and DEFAULT_RESPONSE_DESTINATION_NAME and use null instead as these are just strings to indicated that there is no destination rather than being a default destination git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@743917 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java | 2 +- .../sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java | 2 +- .../sca/binding/jms/provider/JMSBindingServiceBindingProvider.java | 2 +- .../apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java | 2 +- .../apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca') diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java index 46d71897ad..07e1380bba 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java @@ -163,7 +163,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics { queueName = jmsBinding.getResponseDestinationName(); queueType = "JMS Response Destination "; qCreateMode = jmsBinding.getResponseDestinationCreate(); - if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) { + if (queueName == null) { return null; } } else { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java index e7562000e9..f39f070321 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java @@ -92,7 +92,7 @@ public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvi public Invoker createInvoker(Operation operation) { - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { + if (jmsBinding.getDestinationName() == null) { if (!reference.isCallback()) { throw new JMSBindingException("No destination specified for reference " + reference.getName()); } diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java index dd0a2c0b3e..93bf0cb03e 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java @@ -94,7 +94,7 @@ public class JMSBindingServiceBindingProvider implements ServiceBindingProviderR this.extensionPoints = extensionPoints; this.jmsResourceFactory = jmsResourceFactory; - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { + if (jmsBinding.getDestinationName() == null) { if (!service.isCallback()) { // use the SCA service name as the default destination name jmsBinding.setDestinationName(service.getName()); diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java index 8136c524c6..d3197c1f43 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java @@ -163,7 +163,7 @@ public class JMSResourceFactoryImpl implements JMSResourceFactory { * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#lookupDestination(java.lang.String) */ public Destination lookupDestination(String destName) throws NamingException { - if (JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(destName)) { + if (destName == null) { return null; } diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java index c5cc5998ce..08849e6245 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java @@ -129,7 +129,7 @@ public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics { queueName = jmsBinding.getResponseDestinationName(); queueType = "JMS Response Destination "; qCreateMode = jmsBinding.getResponseDestinationCreate(); - if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) { + if (queueName == null) { return null; } } else { -- cgit v1.2.3