You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2013/05/22 18:16:45 UTC

svn commit: r1485268 - /cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

Author: ay
Date: Wed May 22 16:16:44 2013
New Revision: 1485268

URL: http://svn.apache.org/r1485268
Log:
[CXF-5032] Suppor SOAP 1.2 in DynamicClient

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1485268&r1=1485267&r2=1485268&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed May 22 16:16:44 2013
@@ -37,6 +37,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
@@ -253,12 +254,22 @@ public class ClientImpl
             for (ServiceInfo svcfo : svc.getServiceInfos()) {
                 for (EndpointInfo e : svcfo.getEndpoints()) {
                     BindingInfo bfo = e.getBinding();
-
-                    if (bfo.getBindingId().equals("http://schemas.xmlsoap.org/wsdl/soap/")) {
+                    String bid = bfo.getBindingId();
+                    if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(bid)) {
                         for (Object o : bfo.getExtensors().get()) {
                             if (o instanceof SOAPBinding) {
                                 SOAPBinding soapB = (SOAPBinding)o;
-                                if (soapB.getTransportURI().equals("http://schemas.xmlsoap.org/soap/http")) {
+                                if ("http://schemas.xmlsoap.org/soap/http".equals(soapB.getTransportURI())) {
+                                    epfo = e;
+                                    break;
+                                }
+                            }
+                        }
+                    } else if ("http://schemas.xmlsoap.org/wsdl/soap12/".equals(bid)) {
+                        for (Object o : bfo.getExtensors().get()) {
+                            if (o instanceof SOAP12Binding) {
+                                SOAP12Binding soapB = (SOAP12Binding)o;
+                                if ("http://schemas.xmlsoap.org/soap/http".equals(soapB.getTransportURI())) {
                                     epfo = e;
                                     break;
                                 }