cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject cxf git commit: [CXF-7356]need consider SoapBinding has multiple default namespace when compare two bindingId
Date Tue, 02 May 2017 08:27:22 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f29db4a71 -> c2aad6f0e


[CXF-7356]need consider SoapBinding has multiple default namespace when compare two bindingId

(cherry picked from commit 24f4c842da48e0a3ff06a2f5589011a90862f56d)
(cherry picked from commit 253b9aa205d8033e29313c2de93762d8b4f42071)


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c2aad6f0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c2aad6f0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c2aad6f0

Branch: refs/heads/3.0.x-fixes
Commit: c2aad6f0e81c53be1181c11494d4d9139cd16809
Parents: f29db4a
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Tue May 2 16:25:54 2017 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Tue May 2 16:27:08 2017 +0800

----------------------------------------------------------------------
 .../apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c2aad6f0/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
index 2ceab1f..ec77e35 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
@@ -26,6 +26,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.BusException;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.binding.soap.SoapBindingConfiguration;
+import org.apache.cxf.binding.soap.SoapBindingFactory;
 import org.apache.cxf.binding.soap.jms.interceptor.SoapJMSConstants;
 import org.apache.cxf.binding.soap.model.SoapBindingInfo;
 import org.apache.cxf.common.i18n.Message;
@@ -149,7 +150,10 @@ public abstract class AbstractWSDLBasedEndpointFactory extends AbstractEndpointF
                     + endpointName + " in wsdl doesn't match " + transportId + ".");
                 BindingInfo bi = ei.getBinding();
                 ei = createEndpointInfo(bi);
-            } else if (bindingId != null && !ei.getBinding().getBindingId().equals(bindingId))
{
+            } else if (bindingId != null && !ei.getBinding().getBindingId().equals(bindingId)
+                //consider SoapBinding has multiple default namespace
+                && !(SoapBindingFactory.DEFAULT_NAMESPACES.contains(bindingId)
+                    && SoapBindingFactory.DEFAULT_NAMESPACES.contains(ei.getBinding().getBindingId())))
{
                 LOG.warning("Binding for endpoint/port "
                     + endpointName + " in wsdl doesn't match " + bindingId + ".");
                 ei = createEndpointInfo(null);


Mime
View raw message