Bug 416713 - Avoid NPE when recursively searching a path containing an empty directory.
The possibility of an NPE exists in DirBundleFile.getEntryPaths if all of the following apply.
(1) The bundle file contains an empty directory.
(2) The given path contains the empty directory.
(3) Recursion was requested.
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
index fa1c338..4527281 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
@@ -146,8 +146,11 @@
StringBuilder sb = new StringBuilder(dirPath).append(s);
if (BundleFile.secureAction.isDirectory(childFile)) {
sb.append("/"); //$NON-NLS-1$
- if (recurse)
- entries.addAll(Collections.list(getEntryPaths(sb.toString(), true)));
+ if (recurse) {
+ Enumeration<String> e = getEntryPaths(sb.toString(), true);
+ if (e != null)
+ entries.addAll(Collections.list(e));
+ }
}
entries.add(sb.toString());
}
