Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C695200BCE for ; Fri, 18 Nov 2016 03:32:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1AEE9160B18; Fri, 18 Nov 2016 02:32:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 64661160B0B for ; Fri, 18 Nov 2016 03:32:27 +0100 (CET) Received: (qmail 85718 invoked by uid 500); 18 Nov 2016 02:32:26 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 85703 invoked by uid 99); 18 Nov 2016 02:32:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2016 02:32:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7AFBEE0C0A; Fri, 18 Nov 2016 02:32:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: CXF-7134: Store the creational context of each bean being created so they can be destroyed later on. This closes #200. Date: Fri, 18 Nov 2016 02:32:26 +0000 (UTC) archived-at: Fri, 18 Nov 2016 02:32:28 -0000 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 Authored: Thu Nov 17 21:31:50 2016 -0500 Committer: reta 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> 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; } /**