Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-07-13 14:23:45 +0000
committerThomas Watson2016-07-13 14:23:45 +0000
commit90a8f7255361798ed19fd41ab6c7df2e76b6630d (patch)
tree96492c640eea68e11144bfca5445e72eb41fcda5 /bundles/org.eclipse.osgi/container
parent344976e2eadd16579efd04b0a563b42d96726316 (diff)
downloadrt.equinox.framework-90a8f7255361798ed19fd41ab6c7df2e76b6630d.tar.gz
rt.equinox.framework-90a8f7255361798ed19fd41ab6c7df2e76b6630d.tar.xz
rt.equinox.framework-90a8f7255361798ed19fd41ab6c7df2e76b6630d.zip
derived Change-Id: I7ff18cea64a58827ab74374c2b8db5fb97b80837 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/container')
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java6
1 files changed, 6 insertions, 0 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 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 {

Back to the top