You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2017/02/01 02:43:30 UTC
cxf git commit: Enhanced CDI Extension to support JAX-RS Features
(registered as providers) along with Apache CXF Features
Repository: cxf
Updated Branches:
refs/heads/master 9c7ccd5cc -> 3bebf6b49
Enhanced CDI Extension to support JAX-RS Features (registered as providers) along with Apache CXF Features
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3bebf6b4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3bebf6b4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3bebf6b4
Branch: refs/heads/master
Commit: 3bebf6b49283d9a9c36365c030533a3508f836c7
Parents: 9c7ccd5
Author: reta <dr...@gmail.com>
Authored: Tue Jan 31 21:43:00 2017 -0500
Committer: reta <dr...@gmail.com>
Committed: Tue Jan 31 21:43:00 2017 -0500
----------------------------------------------------------------------
.../main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3bebf6b4/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 97d8e0c..89394d2 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -107,6 +107,8 @@ public class JAXRSCdiResourceExtension implements Extension {
serviceBeans.add(event.getBean());
} else if (event.getAnnotated().isAnnotationPresent(Provider.class)) {
providerBeans.add(event.getBean());
+ } else if (event.getBean().getTypes().contains(javax.ws.rs.core.Feature.class)) {
+ providerBeans.add((Bean< ? extends Feature >)event.getBean());
} else if (event.getBean().getTypes().contains(Feature.class)) {
featureBeans.add((Bean< ? extends Feature >)event.getBean());
} else if (CdiBusBean.CXF.equals(event.getBean().getName())