Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 24D14F082 for ; Thu, 4 Apr 2013 14:33:43 +0000 (UTC) Received: (qmail 50443 invoked by uid 500); 4 Apr 2013 14:33:43 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 50374 invoked by uid 500); 4 Apr 2013 14:33:42 -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 50365 invoked by uid 99); 4 Apr 2013 14:33:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 14:33:42 +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; Thu, 04 Apr 2013 14:33:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6F540238897A; Thu, 4 Apr 2013 14:33:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1464569 - /felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Date: Thu, 04 Apr 2013 14:33:19 -0000 To: commits@felix.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130404143319.6F540238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickhall Date: Thu Apr 4 14:33:19 2013 New Revision: 1464569 URL: http://svn.apache.org/r1464569 Log: Apply patch (FELIX-4008) to avoid NPE when converting blame to string. Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java?rev=1464569&r1=1464568&r2=1464569&view=diff ============================================================================== --- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java (original) +++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Thu Apr 4 14:33:19 2013 @@ -2007,8 +2007,20 @@ public class ResolverImpl implements Res allCandidates, blame.m_reqs.get(i)); sb.append(export.getNamespace()); - sb.append("="); - sb.append(export.getAttributes().get(export.getNamespace()).toString()); + sb.append(": "); + Object namespaceVal = export.getAttributes().get(export.getNamespace()); + if (namespaceVal != null) + { + sb.append(namespaceVal.toString()); + } + else + { + for (Entry attrEntry : export.getAttributes().entrySet()) + { + sb.append(attrEntry.getKey()).append('=') + .append(attrEntry.getValue()).append(';'); + } + } if (export.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE) && !export.getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE) .equals(blame.m_cap.getAttributes().get( @@ -2193,4 +2205,4 @@ public class ResolverImpl implements Res return m_blames.toString(); } } -} \ No newline at end of file +}