| commit | 671f70606091d87ad97c36ae13febe49cf69cf11 | [log] [tgz] |
|---|---|---|
| author | Thomas Watson <tjwatson@us.ibm.com> | Wed Apr 10 10:57:12 2013 -0500 |
| committer | Thomas Watson <tjwatson@us.ibm.com> | Wed Apr 10 10:57:12 2013 -0500 |
| tree | 837c661b00528bf7af497fafd119a24cb301fdfa | |
| parent | 5ad325360d09f89d8cb3766164e9340041aec535 [diff] |
Bug 395274 - Equinox returns valid bundle entries for invalid paths - avoid unnecessary call to getCononicalPath
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 890104a..e94db2c 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
@@ -94,7 +94,7 @@ } // must do an extra check to make sure file is within the bundle (bug 320546) if (checkInBundle) { - if (!canonicalFile.getPath().startsWith(BundleFile.secureAction.getCanonicalPath(basefile))) + if (!canonicalFile.getPath().startsWith(basefile.getPath())) return null; } } catch (IOException e) {