TUSCANY-2857 Correct handling of JMSDeliveryMode and JMSPriority

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@747867 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 40 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java b/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
index 58100cfb8d..3c7b4467ba 100644
--- a/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
+++ b/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
@@ -81,53 +81,14 @@ public class JMSHeaderReferencePolicyInterceptor implements Interceptor {
     }
 
     public Message invoke(Message msg) {
-        try {
             // get the jms context
             JMSBindingContext context = msg.getBindingContext();
 
             javax.jms.Message jmsMsg = msg.getBody();
-            String operationName = msg.getOperation().getName();
     
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getDeliveryModePersistent() != null)) {
-                if (jmsHeaderPolicy.getDeliveryModePersistent()) {
-                    jmsMsg.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
-                } else {
-                    jmsMsg.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-                }
-                
-            } 
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getJmsCorrelationId() != null)) {
-                jmsMsg.setJMSCorrelationID(jmsHeaderPolicy.getJmsCorrelationId());
-            } 
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getJmsPriority() != null)) {
-                jmsMsg.setJMSPriority(jmsHeaderPolicy.getJmsPriority());
-            } 
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getJmsType() != null)) {
-                jmsMsg.setJMSType(jmsHeaderPolicy.getJmsType());
-            } 
-           
-            if (jmsHeaderPolicy != null){
-                for (String propName : jmsHeaderPolicy.getProperties().keySet()) {
-                    jmsMsg.setObjectProperty(propName, jmsHeaderPolicy.getProperties().get(propName));
-                }
-            }
-            
-            if (jmsHeaderPolicy != null && 
-                jmsHeaderPolicy.getTimeToLive() != null) {
-                    context.setTimeToLive(jmsHeaderPolicy.getTimeToLive());
-            }            
+            // JMS header attrs set on MessageProducer via interceptors.
                         
             return getNext().invoke(msg);
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
     }
 
     public Invoker getNext() {