From scm-return-47242-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Mon Sep 5 02:49:47 2011 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C75468F1D for ; Mon, 5 Sep 2011 02:49:47 +0000 (UTC) Received: (qmail 47908 invoked by uid 500); 5 Sep 2011 02:49:47 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 47765 invoked by uid 500); 5 Sep 2011 02:49:45 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 47758 invoked by uid 99); 5 Sep 2011 02:49:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2011 02:49:45 +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; Mon, 05 Sep 2011 02:49:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4B077238888F; Mon, 5 Sep 2011 02:49:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165151 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Date: Mon, 05 Sep 2011 02:49:21 -0000 To: scm@geronimo.apache.org From: hanhongfang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110905024921.4B077238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hanhongfang Date: Mon Sep 5 02:49:20 2011 New Revision: 1165151 URL: http://svn.apache.org/viewvc?rev=1165151&view=rev Log: GERONIMO-6144 NPE in DependencyManager if configurations/bundles are uninstalled Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=1165151&r1=1165150&r2=1165151&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Mon Sep 5 02:49:20 2011 @@ -141,7 +141,10 @@ public class DependencyManager implement } List dependentBundles = new ArrayList(dependentBundleIds.size()); for (Long dependentBundleId : dependentBundleIds) { - dependentBundles.add(bundleContext.getBundle(dependentBundleId)); + Bundle b = bundleContext.getBundle(dependentBundleId); + if (b!=null) { + dependentBundles.add(b); + } } return dependentBundles; } @@ -162,7 +165,10 @@ public class DependencyManager implement } Set dependentBundles = new HashSet(fullDependentBundleIds.size()); for (Long dependentBundleId : fullDependentBundleIds) { - dependentBundles.add(bundleContext.getBundle(dependentBundleId)); + Bundle b = bundleContext.getBundle(dependentBundleId); + if (b!=null) { + dependentBundles.add(b); + } } return dependentBundles; }