commit d7eb04a1120afed0ce0772333ab6c2091ff4bc84
author Richard S. Hall <rickhall@apache.org> Thu Feb 09 13:09:15 2006 +0000
committer Richard S. Hall <rickhall@apache.org> Thu Feb 09 13:09:15 2006 +0000
tree 9b25a70a4509241d1aea6b1621c6197789fd0b9e
parent afc52d4537e573a54bce2c3a1cc3d05e84de0ef9

A small patch from Marcel Offermans to avoid an NPE.


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@376282 13f79535-47bb-0310-9956-ffa450edef68

org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java

diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
index 7b93491..e2a162d 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
@@ -1154,13 +1154,10 @@
         {
             // Get the bundle's manifest header.
             Map map = getManifestHeader(revision);
-            if (map == null)
-            {
-                map = new HashMap();
-            }
 
             // Find class path meta-data.
-            String classPath = map.get(FelixConstants.BUNDLE_CLASSPATH).toString();
+            String classPath = (map == null)
+                ? null : (String) map.get(FelixConstants.BUNDLE_CLASSPATH);
 
             // Parse the class path into strings.
             String[] classPathStrings = Util.parseDelimitedString(