diff options
| author | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2010-09-09 03:41:33 +0000 |
|---|---|---|
| committer | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2010-09-09 03:41:33 +0000 |
| commit | b8684ab61870f9c2ff33b98c468471c9215c1387 (patch) | |
| tree | 0d1633fc2e8f613470b2919cdffd110ff683bf82 /sca-java-2.x | |
| parent | a4056aa210a2474b88ca9fc064182bea0b00bbe0 (diff) | |
BJM_3026_1 Ensure correct message selector is used
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@995307 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
2 files changed, 13 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java index bac262ce60..cb957cc35c 100644 --- a/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java +++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java @@ -134,7 +134,8 @@ public class JMSBinding implements Binding, PolicySubject, OperationsConfigurato private Map<String, Integer> operationJMSPriorities = new HashMap<String, Integer>(); private Map<String, Map<String, BindingProperty>> operationPropertiesProperties = new HashMap<String, Map<String,BindingProperty>>(); - private String jmsSelector; + private String jmsSelector = null; + private String uriJmsSelector = null; private QName requestConnectionName; private QName responseConnectionName; private QName operationPropertiesName; @@ -161,7 +162,7 @@ public class JMSBinding implements Binding, PolicySubject, OperationsConfigurato private final Integer defaultPriority = Integer.valueOf(4); private final Boolean defaultDeliveryMode = true; private final Long defaultJMSTimeToLive =Long.valueOf(0); - private boolean isDestinationSpecified = false; + private boolean isDestinationSpecified = false; public JMSBinding() { super(); @@ -751,8 +752,12 @@ public class JMSBinding implements Binding, PolicySubject, OperationsConfigurato } public String getJMSSelector() { - return jmsSelector; + if ( this.uriJmsSelector != null ) + return this.uriJmsSelector; + else + return jmsSelector; } + public void setJMSSelector(String jmsSelector) { this.jmsSelector = jmsSelector; } @@ -1077,5 +1082,9 @@ public class JMSBinding implements Binding, PolicySubject, OperationsConfigurato public boolean isDestinationSpecified() { return this.isDestinationSpecified ; } + + public void setURIJMSSelector(String selector) { + this.uriJmsSelector = selector; + } } diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java b/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java index 51bf974bd9..fb2f168645 100644 --- a/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java +++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java @@ -381,7 +381,7 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St if (selector.endsWith("\"") || selector.endsWith("'")) { selector = selector.substring(0, selector.length() - 1); } - jmsBinding.setJMSSelector(selector); + jmsBinding.setURIJMSSelector(selector); } else if (s.startsWith("type")) { String type = s.substring(5); jmsBinding.setJMSURIType(type); |