You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2012/03/19 13:56:02 UTC
svn commit: r1302404 -
/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
Author: antelder
Date: Mon Mar 19 12:56:02 2012
New Revision: 1302404
URL: http://svn.apache.org/viewvc?rev=1302404&view=rev
Log:
TUSCANY-4024: Move the writing of wireformat and OperationSelector to be in the correct place
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=1302404&r1=1302403&r2=1302404&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 12:56:02 2012
@@ -1145,6 +1145,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);
+ }
+
String correlationScheme = jmsBinding.getCorrelationScheme();
if ( correlationScheme != null ) {
if ( !correlationScheme.equals(JMSBindingConstants.CORRELATE_MSG_ID) ) {
@@ -1190,15 +1200,17 @@ public class JMSBindingProcessor extends
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
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);
}