Revert "Bug 300925 - [shared] Install area calculated incorrectly when launcher and framework not co-located"v20130211-222035

This reverts commit 01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5.

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();