diff options
| author | Thomas Watson | 2017-09-12 18:48:41 +0000 |
|---|---|---|
| committer | Thomas Watson | 2017-09-12 18:59:28 +0000 |
| commit | 5e4efcea7b2902aedba32aa4b4bf6e8c9895de87 (patch) | |
| tree | b077838d0a001a89da85e55896a6856251898cc5 /bundles/org.eclipse.osgi/container/src/org | |
| parent | d3407df5f1308904b377416619d05591b818b2f6 (diff) | |
| download | rt.equinox.framework-5e4efcea7b2902aedba32aa4b4bf6e8c9895de87.tar.gz rt.equinox.framework-5e4efcea7b2902aedba32aa4b4bf6e8c9895de87.tar.xz rt.equinox.framework-5e4efcea7b2902aedba32aa4b4bf6e8c9895de87.zip | |
Bug 522125 - System bundle misses capabilities in unclean startS4_8_0_M2I20170913-2000I20170913-1120I20170913-0800I20170913-0420I20170913-0220I20170912-2255I20170912-2000
Change-Id: I4001b2ecf85a5bf82bb1b12786c776d22b4b8198
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org')
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index d891eff5d..85c9ecd0a 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -1225,18 +1225,20 @@ public class Storage { if (infoId == 0) { content = getSystemContent(); isDirectory = content != null ? content.isDirectory() : false; + // Note that we do not do any checking for absolute paths with + // the system bundle. We always take the content as discovered + // by getSystemContent() } else { content = new File(contentPath); - } - - if (content != null && !content.isAbsolute()) { - // make sure it has the absolute location instead - if (isReference) { - // reference installs are relative to the installPath - content = new File(installPath, contentPath); - } else { - // normal installs are relative to the storage area - content = getFile(contentPath, true); + if (!content.isAbsolute()) { + // make sure it has the absolute location instead + if (isReference) { + // reference installs are relative to the installPath + content = new File(installPath, contentPath); + } else { + // normal installs are relative to the storage area + content = getFile(contentPath, true); + } } } |