Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B71D10A53 for ; Tue, 25 Nov 2014 16:49:18 +0000 (UTC) Received: (qmail 54313 invoked by uid 500); 25 Nov 2014 16:49:18 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 54289 invoked by uid 500); 25 Nov 2014 16:49:18 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 54278 invoked by uid 99); 25 Nov 2014 16:49:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 16:49:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 16:49:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B3CA23889DA; Tue, 25 Nov 2014 16:47:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1641652 - /openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Date: Tue, 25 Nov 2014 16:47:26 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141125164726.5B3CA23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Tue Nov 25 16:47:25 2014 New Revision: 1641652 URL: http://svn.apache.org/r1641652 Log: ejb producer are handled by EJB container so skip it Modified: openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Modified: openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1641652&r1=1641651&r2=1641652&view=diff ============================================================================== --- openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original) +++ openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Tue Nov 25 16:47:25 2014 @@ -840,14 +840,13 @@ public class BeansDeployer protected void removeProducersInDisabledBeans() { - Iterator> beanIterator = webBeansContext.getBeanManagerImpl().getBeans().iterator(); - while (beanIterator.hasNext()) + for (final Bean bean : webBeansContext.getBeanManagerImpl().getBeans()) { - Bean bean = beanIterator.next(); if (bean instanceof AbstractProducerBean) { - AbstractProducerBean producerBean = (AbstractProducerBean) bean; - if (!producerBean.getOwnerBean().isEnabled()) + final AbstractProducerBean producerBean = (AbstractProducerBean) bean; + final InjectionTargetBean ownerBean = producerBean.getOwnerBean(); + if (!ownerBean.isEnabled() && !EnterpriseBeanMarker.class.isInstance(ownerBean)) { // if the parent component is disabled, then we also need to disabled the producer fields and methods in it as well. producerBean.setEnabled(false);