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

2 files changed, 2 insertions, 2 deletions

diff --git a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
index 078a7f36ac..28cb93afc2 100644
--- a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
+++ b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
@@ -163,7 +163,7 @@ public class ASFListener implements JMSServiceListener {
      */

     private Destination lookupDestinationQueue() throws NamingException, JMSBindingException {

 

-        if (isCallbackService && JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(jmsBinding.getDestinationName())) {

+        if (isCallbackService && (jmsBinding.getDestinationName() == null)) {

             // if its a callback service returning null indicates to use a temporary queue

             return null;

         }

diff --git a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
index fc327d593d..1b50525069 100644
--- a/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSResourceFactoryImpl.java
@@ -158,7 +158,7 @@ public class JMSResourceFactoryImpl {
      * @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;

         }