Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-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 4CE6F9E9F for ; Sat, 4 Feb 2012 22:54:08 +0000 (UTC) Received: (qmail 50928 invoked by uid 500); 4 Feb 2012 22:54:08 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 50859 invoked by uid 500); 4 Feb 2012 22:54:07 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 50851 invoked by uid 99); 4 Feb 2012 22:54:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Feb 2012 22:54:07 +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; Sat, 04 Feb 2012 22:54:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F1F912388BBD; Sat, 4 Feb 2012 22:53:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240636 - /aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java Date: Sat, 04 Feb 2012 22:53:43 -0000 To: commits@aries.apache.org From: not@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120204225343.F1F912388BBD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: not Date: Sat Feb 4 22:53:43 2012 New Revision: 1240636 URL: http://svn.apache.org/viewvc?rev=1240636&view=rev Log: ARIES-776 Cope with FrameworkUtil returning null for the Bundle. Modified: aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java Modified: aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java URL: http://svn.apache.org/viewvc/aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java?rev=1240636&r1=1240635&r2=1240636&view=diff ============================================================================== --- aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java (original) +++ aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java Sat Feb 4 22:53:43 2012 @@ -32,7 +32,7 @@ public final class AriesFrameworkUtil static { Bundle b = FrameworkUtil.getBundle(AriesFrameworkUtil.class); - String bundleClassName = b.getClass().getName(); + String bundleClassName = b == null ? "": b.getClass().getName(); if (isEquinox(bundleClassName)) { worker = new EquinoxWorker(); } else if (bundleClassName.startsWith("org.apache.felix")) {