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 DC5D09A0B for ; Mon, 9 Apr 2012 04:37:41 +0000 (UTC) Received: (qmail 18045 invoked by uid 500); 9 Apr 2012 04:37:40 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 17862 invoked by uid 500); 9 Apr 2012 04:37:37 -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 17833 invoked by uid 99); 9 Apr 2012 04:37:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Apr 2012 04:37:36 +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, 09 Apr 2012 04:37:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E24CC23889E3; Mon, 9 Apr 2012 04:37:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1311129 - /geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Date: Mon, 09 Apr 2012 04:37:14 -0000 To: scm@geronimo.apache.org From: johnxiao@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120409043714.E24CC23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: johnxiao Date: Mon Apr 9 04:37:14 2012 New Revision: 1311129 URL: http://svn.apache.org/viewvc?rev=1311129&view=rev Log: Avoid NullPointerException when deploy EBA Modified: geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Modified: geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java?rev=1311129&r1=1311128&r2=1311129&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java (original) +++ geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Mon Apr 9 04:37:14 2012 @@ -453,6 +453,7 @@ public class ApplicationGBean implements @SuppressWarnings("deprecation") private Bundle[] getRequiringBundles(Bundle targetBundle, PackageAdmin packageAdmin) { ExportedPackage[] ePackages = packageAdmin.getExportedPackages(targetBundle); + if(ePackages == null || ePackages.length == 0) return new Bundle[]{}; Set requiringBundles = new HashSet();