diff options
author | Pascal Rapicault | 2013-02-11 22:20:35 +0000 |
---|---|---|
committer | Pascal Rapicault | 2013-02-11 22:20:35 +0000 |
commit | 7518c58aefe37fb25eb1defedfe855a3b24cf6df (patch) | |
tree | dec09106e07a4e0c9fbb7174a8aff55775c16de9 | |
parent | b57f5d5bcd98a17ccbf75d9f2c49960cf24e1b09 (diff) | |
download | rt.equinox.p2-7518c58aefe37fb25eb1defedfe855a3b24cf6df.tar.gz rt.equinox.p2-7518c58aefe37fb25eb1defedfe855a3b24cf6df.tar.xz rt.equinox.p2-7518c58aefe37fb25eb1defedfe855a3b24cf6df.zip |
Revert "Bug 300925 - [shared] Install area calculated incorrectly when launcher and framework not co-located"v20130211-222035
This reverts commit 01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5.
-rw-r--r-- | bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java | 6 |
1 files changed, 1 insertions, 5 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 b25500dc2..fba4751fc 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,11 +339,7 @@ public class EquinoxManipulatorImpl implements Manipulator { private void loadWithoutFwPersistentData() throws IOException { SimpleBundlesState.checkAvailability(fwAdmin); File launcherConfigFile = getLauncherConfigLocation(launcherData); - 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); - } + if (launcherConfigFile != null && !launcherConfigFile.getName().endsWith(IGNORED)) { // use launcher. -- > load from LaucnherConfig file. // the parameters in memory will be updated. EclipseLauncherParser parser = new EclipseLauncherParser(); |