cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1537121 - in /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support: JaxWsEndpointImpl.java JaxWsServiceFactoryBean.java
Date Wed, 30 Oct 2013 14:58:53 GMT
Author: asoldano
Date: Wed Oct 30 14:58:53 2013
New Revision: 1537121

URL: http://svn.apache.org/r1537121
Log:
[CXF-5341] Committing patch from Rebecca Searls, thanks!

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1537121&r1=1537120&r2=1537121&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
Wed Oct 30 14:58:53 2013
@@ -272,7 +272,8 @@ public class JaxWsEndpointImpl extends E
             Iterator<ExtensibilityElement> extensionElements = bindingExtensors.iterator();
             while (extensionElements.hasNext()) {
                 ExtensibilityElement ext = extensionElements.next();
-                if (ext instanceof UnknownExtensibilityElement && Boolean.TRUE.equals(ext.getRequired()))
{
+                if (ext instanceof UnknownExtensibilityElement && Boolean.TRUE.equals(ext.getRequired())
+                    && this.wsFeatures != null) {
                     for (WebServiceFeature feature : this.wsFeatures) {
                         if (feature instanceof RespectBindingFeature && feature.isEnabled())
{
                             

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1537121&r1=1537120&r2=1537121&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Wed Oct 30 14:58:53 2013
@@ -42,6 +42,8 @@ import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.BindingType;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Provider;
+import javax.xml.ws.RespectBinding;
+import javax.xml.ws.RespectBindingFeature;
 import javax.xml.ws.Service;
 import javax.xml.ws.WebFault;
 import javax.xml.ws.WebServiceFeature;
@@ -189,6 +191,15 @@ public class JaxWsServiceFactoryBean ext
 
         }
 
+        RespectBinding respectBinding = implInfo.getImplementorClass().getAnnotation(
+            RespectBinding.class);
+        if (respectBinding == null && serviceClass != null) {
+            respectBinding = serviceClass.getAnnotation(RespectBinding.class);
+        }
+        if (respectBinding != null) {
+            features.add(new RespectBindingFeature(respectBinding.enabled()));
+        }
+
         if (features.size() > 0) {
             wsFeatures = features;
             if (setWsFeatures != null) {



Mime
View raw message