diff options
| -rwxr-xr-x | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java | 13 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java index 983fabf9e..07f7f7ff8 100755 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java @@ -2417,6 +2417,19 @@ public class SystemBundleTests extends AbstractBundleTests { new Equinox(null); } + public void testNullStorageArea() throws BundleException { + File install = getContext().getDataFile(getName()); + install.mkdirs(); + Equinox equinox = new Equinox(Collections.singletonMap("osgi.install.area", install.getAbsolutePath())); + try { + equinox.init(); + String storageArea = equinox.getBundleContext().getProperty(Constants.FRAMEWORK_STORAGE); + assertNotNull("No storage area set.", storageArea); + } finally { + equinox.stop(); + } + } + public void testOSGiDevSetsCheckConfiguration() throws BundleException { String originalCheckConfiguration = System.clearProperty(EquinoxConfiguration.PROP_CHECK_CONFIGURATION); try { 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 eb554cddc..a58275014 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 @@ -126,6 +126,12 @@ public class Storage { Location parent = this.osgiLocation.getParentLocation(); parentRoot = parent == null ? null : new File(parent.getURL().getFile()); + if (container.getConfiguration().getConfiguration(Constants.FRAMEWORK_STORAGE) == null) { + // Set the derived value if not already set as part of configuration. + // Note this is the parent directory of where the framework stores data (org.eclipse.osgi/) + container.getConfiguration().setConfiguration(Constants.FRAMEWORK_STORAGE, childRoot.getParentFile().getAbsolutePath()); + } + InputStream info = getInfoInputStream(); DataInputStream data = info == null ? null : new DataInputStream(new BufferedInputStream(info)); try { |