TUSCANY-4024: Move the writing of wireformat and OperationSelector to be in the correct place

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

1 files changed, 17 insertions, 15 deletions

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 01bc43ad2e..5dcc8f13b6 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
@@ -1145,6 +1145,16 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
         //    }
         //}
 
+        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) ) {
@@ -1190,15 +1200,17 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
               responseASName != null ) {
             
            writer.writeStartElement(Constants.SCA11_NS, "response");
+
+           if ((jmsBinding.getResponseWireFormat() != null) &&
+                   !(jmsBinding.getResponseWireFormat() instanceof WireFormatJMSDefault)){
+                   writeWireFormat(jmsBinding.getResponseWireFormat(), writer, context);
+           }
+               
+          
            writeResponseDestinationProperties( jmsBinding, writer );       
            writeResponseConnectionFactoryProperties( jmsBinding, writer );        
            writeResponseActivationSpecProperties( jmsBinding, writer );
            
-           if ((jmsBinding.getResponseWireFormat() != null) &&
-               !(jmsBinding.getResponseWireFormat() instanceof WireFormatJMSDefault)){
-               writeWireFormat(jmsBinding.getResponseWireFormat(), writer, context);
-           }
-           
            writer.writeEndElement();
            // Strange bug. Without white space, headers end tag improperly read. 
            writer.writeCharacters( " " ); 
@@ -1208,16 +1220,6 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
         
         writeConfiguredOperations( jmsBinding, writer, context );
         
-        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);
-        }
-        
         writeEnd(writer);
     }