Bug 300925 - [shared] Install area calculated incorrectly when launcher
and framework not co-located
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 fba4751..b25500d 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 @@
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();
