Apply patch (FELIX-4008) to avoid NPE when converting blame to string.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1464569 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
index 4a3ee90..0f2caa0 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
@@ -2007,8 +2007,20 @@
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<String, Object> 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 @@
return m_blames.toString();
}
}
-}
\ No newline at end of file
+}