You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2009/11/13 15:55:11 UTC
svn commit: r835866 -
/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java
Author: jbonofre
Date: Fri Nov 13 14:55:11 2009
New Revision: 835866
URL: http://svn.apache.org/viewvc?rev=835866&view=rev
Log:
[SMXCOMP-670] jms:soap-provider doesn't use custom marshaler
Modified:
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java?rev=835866&r1=835865&r2=835866&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java Fri Nov 13 14:55:11 2009
@@ -115,7 +115,14 @@
if (wsdl == null) {
throw new DeploymentException("wsdl property must be set");
}
- JmsSoapProviderMarshaler marshaler = new JmsSoapProviderMarshaler();
+ JmsSoapProviderMarshaler marshaler;
+ if (this.getMarshaler() instanceof JmsSoapProviderMarshaler) {
+ marshaler = (JmsSoapProviderMarshaler) this.getMarshaler();
+ } else if (this.getMarshaler() == null) {
+ marshaler = new JmsSoapProviderMarshaler();
+ } else {
+ throw new DeploymentException("The configured marshaler must inherit JmsSoapProviderMarshaler");
+ }
try {
description = DomUtil.parse(wsdl.getInputStream());
Element elem = description.getDocumentElement();