diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java')
| -rw-r--r-- | bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 f9b4217bf..d638158da 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 @@ -96,8 +96,11 @@ public class DirBundleFile extends BundleFile { StringBuffer sb = new StringBuffer(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()); } |