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 549F8D94E for ; Fri, 14 Dec 2012 14:26:58 +0000 (UTC) Received: (qmail 57553 invoked by uid 500); 14 Dec 2012 14:26:58 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 57534 invoked by uid 500); 14 Dec 2012 14:26:57 -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 57523 invoked by uid 99); 14 Dec 2012 14:26:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2012 14:26:57 +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; Fri, 14 Dec 2012 14:26:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 030452388A64; Fri, 14 Dec 2012 14:26:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1421886 - /openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Date: Fri, 14 Dec 2012 14:26:31 -0000 To: commits@openwebbeans.apache.org From: tandraschko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121214142632.030452388A64@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tandraschko Date: Fri Dec 14 14:26:30 2012 New Revision: 1421886 URL: http://svn.apache.org/viewvc?rev=1421886&view=rev Log: (OWB-736) NPE while removing dependent beans Modified: openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Modified: openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1421886&r1=1421885&r2=1421886&view=diff ============================================================================== --- openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original) +++ openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Fri Dec 14 14:26:30 2012 @@ -211,22 +211,25 @@ public class CreationalContextImpl im synchronized(this) { - List> values = dependentObjects.get(ownerInstance); - if(values != null && !values.isEmpty()) + if (dependentObjects != null) { - Iterator> it = values.iterator(); - while(it.hasNext()) + List> values = dependentObjects.get(ownerInstance); + if (values != null && !values.isEmpty()) { - DependentCreationalContext dc = it.next(); - if(dc.getDependentType().equals(DependentType.INTERCEPTOR) && - dc.getContextual().equals(interceptor)) + Iterator> it = values.iterator(); + while (it.hasNext()) { - return dc.getInstance(); + DependentCreationalContext dc = it.next(); + if (dc.getDependentType().equals(DependentType.INTERCEPTOR) && + dc.getContextual().equals(interceptor)) + { + return dc.getInstance(); + } } - } } } + return null; } @@ -246,18 +249,21 @@ public class CreationalContextImpl im synchronized(this) { - List> values = dependentObjects.get(ownerInstance); - if (values != null && values.size() > 0) + if (dependentObjects != null) { - Iterator> it = values.iterator(); - while (it.hasNext()) + List> values = dependentObjects.get(ownerInstance); + if (values != null && values.size() > 0) { - DependentCreationalContext dc = it.next(); - - if(dc.getDependentType().equals(DependentType.DECORATOR) && - dc.getContextual().equals(decorator)) + Iterator> it = values.iterator(); + while (it.hasNext()) { - return dc.getInstance(); + DependentCreationalContext dc = it.next(); + + if (dc.getDependentType().equals(DependentType.DECORATOR) && + dc.getContextual().equals(decorator)) + { + return dc.getInstance(); + } } } } @@ -278,32 +284,35 @@ public class CreationalContextImpl im synchronized(this) { - Collection>> values = dependentObjects.values(); - if(values != null) + if (dependentObjects != null) { - for(List> value : values) + Collection>> values = dependentObjects.values(); + if (values != null) { - // this is kind of an emergency valve... - int maxRemoval = value.size() * 3; - while(!value.isEmpty() && maxRemoval > 0) + for (List> value : values) { - // we don't use an iterator because the destroyal might register a - // fresh PreDestroy interceptor as dependent object... - DependentCreationalContext dependent = (DependentCreationalContext)value.get(0); - dependent.getContextual().destroy((T)dependent.getInstance(), this); + // this is kind of an emergency valve... + int maxRemoval = value.size() * 3; + while (!value.isEmpty() && maxRemoval > 0) + { + // we don't use an iterator because the destroyal might register a + // fresh PreDestroy interceptor as dependent object... + DependentCreationalContext dependent = (DependentCreationalContext) value.get(0); + dependent.getContextual().destroy((T) dependent.getInstance(), this); - value.remove(0); - maxRemoval--; - } + value.remove(0); + maxRemoval--; + } - if (maxRemoval == 0) - { - throw new WebBeansException("infinite loop detected while destroying bean " + contextual); + if (maxRemoval == 0) + { + throw new WebBeansException("infinite loop detected while destroying bean " + contextual); + } } } - } - dependentObjects = null; + dependentObjects = null; + } } // the instances are managed as normal dependent instances already