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

[antelder]

Author: antelder
Date: Mon Mar 19 14:23:23 2012
New Revision: 1302469

URL: http://svn.apache.org/viewvc?rev=1302469&view=rev
Log:
TUSCANY-4024: Adjust position of wireFormat element writing

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=1302469&r1=1302468&r2=1302469&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
 Mon Mar 19 14:23:23 2012
@@ -1145,16 +1145,6 @@ public class JMSBindingProcessor extends
         //    }
         //}
 
-        if ((jmsBinding.getRequestWireFormat() != null) &&
-                !(jmsBinding.getRequestWireFormat() instanceof 
WireFormatJMSDefault)){
-                writeWireFormat(jmsBinding.getRequestWireFormat(), writer, 
context);
-        }
-            
-        if ((jmsBinding.getOperationSelector() != null) &&
-                !(jmsBinding.getOperationSelector() instanceof 
OperationSelectorJMSDefault)){
-                writeOperationSelector(jmsBinding.getOperationSelector(), 
writer, context);
-        }
-            
         String correlationScheme = jmsBinding.getCorrelationScheme();
         if ( correlationScheme != null ) {
             if ( 
!correlationScheme.equals(JMSBindingConstants.CORRELATE_MSG_ID) ) {
@@ -1177,6 +1167,16 @@ public class JMSBindingProcessor extends
             }
         }
 
+        if ((jmsBinding.getRequestWireFormat() != null) &&
+                !(jmsBinding.getRequestWireFormat() instanceof 
WireFormatJMSDefault)){
+                writeWireFormat(jmsBinding.getRequestWireFormat(), writer, 
context);
+        }
+            
+        if ((jmsBinding.getOperationSelector() != null) &&
+                !(jmsBinding.getOperationSelector() instanceof 
OperationSelectorJMSDefault)){
+                writeOperationSelector(jmsBinding.getOperationSelector(), 
writer, context);
+        }
+            
         if ( jmsBinding.containsHeaders() ) {
            writeHeaders( jmsBinding, writer);
         }