From fea84bc2dd440ae3c7d36990ad24455166455415 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 24 Apr 2009 11:49:38 +0000 Subject: TUSCANY-2930 main part of separating wireFormat.jmsdefault out from wireFormat.jmsTextXML. I've spotted a few more things that need fixing but this basic functionality passes all of our current JMS tests and now better matched what the specification says about default format. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@768263 13f79535-47bb-0310-9956-ffa450edef68 --- .../jmstext/runtime/WireFormatJMSTextReferenceProvider.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java') diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java index 24d963010c..5a8af69c64 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java @@ -57,10 +57,17 @@ public class WireFormatJMSTextReferenceProvider implements WireFormatProvider { // currently maintaining the message processor structure which // contains the details of jms message processing however override // any message processors specified in the SCDL in this case - if (this.binding.getRequestWireFormat() instanceof WireFormatJMSText){ + + // this wire format doubles up as the execution logic for user defined + // message processors so check the processor name is still set to default + // before overwriting + + if ((this.binding.getRequestWireFormat() instanceof WireFormatJMSText) && + (this.binding.getRequestMessageProcessorName().equals(JMSBindingConstants.DEFAULT_MP_CLASSNAME))){ this.binding.setRequestMessageProcessorName(JMSBindingConstants.TEXT_MP_CLASSNAME); } - if (this.binding.getResponseWireFormat() instanceof WireFormatJMSText){ + if ((this.binding.getResponseWireFormat() instanceof WireFormatJMSText) && + (this.binding.getResponseMessageProcessorName().equals(JMSBindingConstants.DEFAULT_MP_CLASSNAME))){ this.binding.setResponseMessageProcessorName(JMSBindingConstants.TEXT_MP_CLASSNAME); } -- cgit v1.2.3