Repository: cxf Updated Branches: refs/heads/3.1.x-fixes c70b431fa -> c1dd0748c
CXF-7134: Store the creational context of each bean being created so they can be destroyed later on. This closes #200. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c1dd0748 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c1dd0748 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c1dd0748 Branch: refs/heads/3.1.x-fixes Commit: c1dd0748cd2af888e3e03c8a6f46b9550b281f64 Parents: c70b431 Author: reta <[email protected]> Authored: Thu Nov 17 21:31:50 2016 -0500 Committer: reta <[email protected]> Committed: Thu Nov 17 21:31:50 2016 -0500 ---------------------------------------------------------------------- .../org/apache/cxf/cdi/JAXRSCdiResourceExtension.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c1dd0748/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 3d50e89..68cd164 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 @@ -295,7 +295,7 @@ public class JAXRSCdiResourceExtension implements Extension { beanManager.getReference( bean, bean.getBeanClass(), - beanManager.createCreationalContext(bean) + createCreationalContext(beanManager, bean) ) ); } @@ -310,21 +310,21 @@ public class JAXRSCdiResourceExtension implements Extension { * @return the references for all discovered CXF-specific features */ private List< Feature > loadFeatures(final BeanManager beanManager, Collection<Class<?>> limitedClasses) { - final List< Feature > services = new ArrayList<>(); + final List< Feature > features = new ArrayList<>(); for (final Bean< ? extends Feature > bean: featureBeans) { if (limitedClasses.isEmpty() || limitedClasses.contains(bean.getBeanClass())) { - services.add( + features.add( (Feature) beanManager.getReference( bean, bean.getBeanClass(), - beanManager.createCreationalContext(bean) + createCreationalContext(beanManager, bean) ) ); } } - return services; + return features; } /**
