Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 58337 invoked from network); 27 Feb 2011 12:31:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Feb 2011 12:31:44 -0000 Received: (qmail 60456 invoked by uid 500); 27 Feb 2011 12:31:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 60388 invoked by uid 500); 27 Feb 2011 12:31:42 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 60379 invoked by uid 99); 27 Feb 2011 12:31:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Feb 2011 12:31:41 +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; Sun, 27 Feb 2011 12:31:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 687A023889B2; Sun, 27 Feb 2011 12:31:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075037 - /directory/shared/branches/akarasulu/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java Date: Sun, 27 Feb 2011 12:31:20 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110227123120.687A023889B2@eris.apache.org> Author: akarasulu Date: Sun Feb 27 12:31:20 2011 New Revision: 1075037 URL: http://svn.apache.org/viewvc?rev=1075037&view=rev Log: fixing potential null pointer exception: some jars do not seem to have manifests Modified: directory/shared/branches/akarasulu/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java Modified: directory/shared/branches/akarasulu/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java?rev=1075037&r1=1075036&r2=1075037&view=diff ============================================================================== --- directory/shared/branches/akarasulu/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java (original) +++ directory/shared/branches/akarasulu/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java Sun Feb 27 12:31:20 2011 @@ -185,6 +185,11 @@ public class OsgiUtils jar = new JarFile( bundle ); Manifest manifest = jar.getManifest(); + if ( manifest == null ) + { + return null; + } + Attributes attrs = manifest.getMainAttributes(); for ( Object key : attrs.keySet() ) {