Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ_Houghton2013-02-04 21:02:54 -0500
committerPascal Rapicault2013-02-04 21:02:54 -0500
commit01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5 (patch)
tree1afd9e1c98f69881638a5e91ae64821161f84a7c /bundles/org.eclipse.equinox.frameworkadmin.equinox
parentc0d06cc4735ba69c02d5783b602942725339f39f (diff)
downloadrt.equinox.p2-01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5.tar.gz
rt.equinox.p2-01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5.tar.xz
rt.equinox.p2-01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5.zip
Bug 300925 - [shared] Install area calculated incorrectly when launcherv20130205-020254
and framework not co-located
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java
index fba4751fc..b25500dc2 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java
@@ -339,7 +339,11 @@ public class EquinoxManipulatorImpl implements Manipulator {
private void loadWithoutFwPersistentData() throws IOException {
SimpleBundlesState.checkAvailability(fwAdmin);
File launcherConfigFile = getLauncherConfigLocation(launcherData);
- if (launcherConfigFile != null && !launcherConfigFile.getName().endsWith(IGNORED)) {
+ if (launcherConfigFile != null) {
+ // if ignored then try to read the parent
+ if (launcherConfigFile.getName().endsWith(IGNORED)) {
+ launcherConfigFile = new File(launcherData.getLauncher().getAbsolutePath() + EquinoxConstants.INI_EXTENSION);
+ }
// use launcher. -- > load from LaucnherConfig file.
// the parameters in memory will be updated.
EclipseLauncherParser parser = new EclipseLauncherParser();

Back to the top