You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2010/09/09 05:41:33 UTC
svn commit: r995307 - in
/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms:
JMSBinding.java JMSBindingProcessor.java
Author: bdaniel
Date: Thu Sep 9 03:41:33 2010
New Revision: 995307
URL: http://svn.apache.org/viewvc?rev=995307&view=rev
Log:
BJM_3026_1 Ensure correct message selector is used
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java?rev=995307&r1=995306&r2=995307&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java Thu Sep 9 03:41:33 2010
@@ -134,7 +134,8 @@ public class JMSBinding implements Bindi
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 Bindi
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 Bindi
}
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 Bindi
public boolean isDestinationSpecified() {
return this.isDestinationSpecified ;
}
+
+ public void setURIJMSSelector(String selector) {
+ this.uriJmsSelector = selector;
+ }
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?rev=995307&r1=995306&r2=995307&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java Thu Sep 9 03:41:33 2010
@@ -381,7 +381,7 @@ public class JMSBindingProcessor extends
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);