Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 2028 invoked from network); 28 Apr 2010 20:38:02 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Apr 2010 20:38:02 -0000 Received: (qmail 50892 invoked by uid 500); 28 Apr 2010 20:38:02 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 50826 invoked by uid 500); 28 Apr 2010 20:38:02 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 50819 invoked by uid 99); 28 Apr 2010 20:38:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Apr 2010 20:38:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 28 Apr 2010 20:37:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0721B238897F; Wed, 28 Apr 2010 20:37:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r939080 - /felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java Date: Wed, 28 Apr 2010 20:37:08 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100428203709.0721B238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pderop Date: Wed Apr 28 20:37:08 2010 New Revision: 939080 URL: http://svn.apache.org/viewvc?rev=939080&view=rev Log: avoid NPE when invoking Bnd's error method Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java?rev=939080&r1=939079&r2=939080&view=diff ============================================================================== --- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java (original) +++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java Wed Apr 28 20:37:08 2010 @@ -120,7 +120,7 @@ public class DescriptorGenerator extends } sb.append(": "); sb.append(parse(err)); - error(sb.toString(), err.getCause()); + error(sb.toString()); return false; }