From 90a8f7255361798ed19fd41ab6c7df2e76b6630d Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 13 Jul 2016 09:23:45 -0500 Subject: Bug 486952 - [osgi R7] set org.osgi.framework.storage property when derived Change-Id: I7ff18cea64a58827ab74374c2b8db5fb97b80837 Signed-off-by: Thomas Watson --- .../container/src/org/eclipse/osgi/storage/Storage.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bundles/org.eclipse.osgi/container') 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 { -- cgit v1.2.3