Return-Path: Delivered-To: apmail-incubator-felix-commits-archive@www.apache.org Received: (qmail 7876 invoked from network); 20 Jul 2006 08:03:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Jul 2006 08:03:07 -0000 Received: (qmail 90082 invoked by uid 500); 20 Jul 2006 08:03:07 -0000 Delivered-To: apmail-incubator-felix-commits-archive@incubator.apache.org Received: (qmail 90065 invoked by uid 500); 20 Jul 2006 08:03:07 -0000 Mailing-List: contact felix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: felix-dev@incubator.apache.org Delivered-To: mailing list felix-commits@incubator.apache.org Received: (qmail 90054 invoked by uid 99); 20 Jul 2006 08:03:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jul 2006 01:03:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jul 2006 01:03:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BDCFB1A981A; Thu, 20 Jul 2006 01:02:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r423815 - /incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java Date: Thu, 20 Jul 2006 08:02:45 -0000 To: felix-commits@incubator.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060720080246.BDCFB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rickhall Date: Thu Jul 20 01:02:42 2006 New Revision: 423815 URL: http://svn.apache.org/viewvc?rev=423815&view=rev Log: Fixed a bug that could lead to a null pointer exception. Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java?rev=423815&r1=423814&r2=423815&view=diff ============================================================================== --- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java (original) +++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java Thu Jul 20 01:02:42 2006 @@ -2022,7 +2022,9 @@ synchronized (m_uninstalledBundlesLock_Priority3) { - for (int i = 0; i < m_uninstalledBundles.length; i++) + for (int i = 0; + (m_uninstalledBundles != null) && (i < m_uninstalledBundles.length); + i++) { if (m_uninstalledBundles[i].getInfo().getBundleId() == id) {