Allow features that implement CXF's feature interface
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4f91a209 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f91a209 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f91a209 Branch: refs/heads/master Commit: 4f91a2098dddd01dd0e65f38dd6ad542c5ea3b7b Parents: 40a8c92 Author: Daniel Kulp <[email protected]> Authored: Wed Apr 8 09:56:14 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Apr 8 19:19:54 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4f91a209/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java index cf797aa..29f968a 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java @@ -54,6 +54,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.feature.Feature; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.jaxws.EndpointUtils; @@ -110,7 +111,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider { @SuppressWarnings("rawtypes") Class serviceClass, WebServiceFeature ... features) { for (WebServiceFeature f : features) { - if (!f.getClass().getName().startsWith("javax.xml.ws")) { + if (!f.getClass().getName().startsWith("javax.xml.ws") + && !(f instanceof Feature)) { throw new WebServiceException("Unknown feature error: " + f.getClass().getName()); } }
