svn commit: r1197149 - /tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java

[antelder]

Author: antelder
Date: Thu Nov  3 14:33:52 2011
New Revision: 1197149

URL: http://svn.apache.org/viewvc?rev=1197149&view=rev
Log:
TUSCANY-3971: JMSBindingProcessor.writeOperationProperties should trim() 
properties prior to writing them & update logic to write JMS attributes even if 
properties are null.

Modified:
    
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/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=1197149&r1=1197148&r2=1197149&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 Nov  3 14:33:52 2011
@@ -1304,16 +1304,14 @@ public class JMSBindingProcessor extends
             Integer jmsPriority = jmsBinding.getOperationJMSPriority(opName);
             Map<String, Object> operationProperties = 
jmsBinding.getOperationProperties(opName);
             
-            if (operationProperties != null){
-                if ((jmsType != null && jmsType.length() > 0) || 
-                    (jmsCorrelationId != null && jmsCorrelationId.length() > 
0) || 
-                    jmsDeliveryMode != null || jmsTimeToLive != null || 
-                    jmsPriority != null) {
-                    
+            if ( (operationProperties != null && 
!operationProperties.isEmpty()) || (jmsType != null && jmsType.trim().length() 
> 0) ||
+                jmsDeliveryMode != null || jmsTimeToLive != null ||
+                jmsPriority != null) {            
+            
                     writer.writeStartElement(Constants.SCA11_NS, 
JMSBindingConstants.HEADERS);              
                     
-                    if (jmsType != null && jmsType.length() > 0) {
-                        writer.writeAttribute("type", jmsType);
+                    if (jmsType != null && jmsType.trim().length() > 0) {
+                        writer.writeAttribute("type", jmsType.trim());
                     }
     
                     if (jmsDeliveryMode != null) {
@@ -1336,7 +1334,6 @@ public class JMSBindingProcessor extends
                     writer.writeEndElement();
                     // Strange bug. Without white space, headers end tag 
improperly read. 
                     // writer.writeCharacters( " " ); 
-                }
             }
 
             writer.writeEndElement();