This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | need to update Netbinox Equinox 3.9.1 | ||
---|---|---|---|
Product: | platform | Reporter: | stoto79 |
Component: | Netigso | Assignee: | Jaroslav Tulach <jtulach> |
Status: | VERIFIED FIXED | ||
Severity: | normal | CC: | anebuzelsky, stoto79, tpavek, tstupka |
Priority: | P2 | Keywords: | NO80 |
Version: | 8.0 | ||
Hardware: | PC | ||
OS: | Linux | ||
Issue Type: | DEFECT | Exception Reporter: |
Description
stoto79
2014-01-23 20:29:53 UTC
Not for NetBeans 8.0 - has to wait for another release. Got the binary of Kepler SR2 and executed unit tests. There seems to be one failure due to incompatible change in Equinox which I need to resolve. If that is all, it would be good compared to previous update. The change of one parameter constructor to two parameter has been done in rt.equinox.framework$ git show bda5862 commit bda586273cfe19c14ef7cc12517c6f6c5b7d68d0 Merge: 9e41c79 671f706 Author: Thomas Watson <tjwatson@us.ibm.com> Date: Mon Apr 15 20:49:44 2013 -0500 Merge branch 'master' into twatson/container Conflicts: bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java The previous commit is just a merge. The actual error commit is commit 5ad325360d09f89d8cb3766164e9340041aec535 Author: Thomas Watson <tjwatson@us.ibm.com> Date: Wed Apr 10 10:34:29 2013 -0500 Bug 395274 - Equinox returns valid bundle entries for invalid paths - additional fix to properly use canonical paths for the basefile 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 index 295a866..890104a 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 @@ -38,12 +35,16 @@ public class DirBundleFile extends BundleFile { * @param basefile the base file * @throws IOException */ - public DirBundleFile(File basefile) throws IOException { - super(basefile); + public DirBundleFile(File basefile, boolean enableStrictBundleEntryPath) throws IOException { + super(getBaseFile(basefile, enableStrictBundleEntryPath)); if (!BundleFile.secureAction.exists(basefile) || !BundleFile.secureAction.isDirectory(basefile)) { Pushed as https://hg.netbeans.org/ergonomics/rev/e8aefa38c492 The unit tests pass. IDE starts. I can connect to NetBeans bugzilla. Will see what the whole integration suite thinks about the change. Tondo, please check if there is any necessary paperwork to be done. Thanks. Integrated into 'main-silver', will be available in build *201405260001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-silver/rev/e8aefa38c492 User: Jaroslav Tulach <jtulach@netbeans.org> Log: #240903: Upgrading to equinox 3.9.1 According to Thomas[1] the next upgrade may not be as smooth. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=395274#c23 |