Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-01-26 16:53:07 +0000
committerPascal Rapicault2010-01-26 16:53:07 +0000
commit11132925f1bac991c0de4ce197b6384ed550e512 (patch)
treee96c3b133443756ab222fc1237cce689417149a3
parent13af35dfe002d932721a1e7056a77cfc7323072b (diff)
downloadrt.equinox.p2-11132925f1bac991c0de4ce197b6384ed550e512.tar.gz
rt.equinox.p2-11132925f1bac991c0de4ce197b6384ed550e512.tar.xz
rt.equinox.p2-11132925f1bac991c0de4ce197b6384ed550e512.zip
Bug 293120 - [fwkAdmin] vm option in eclipse.ini getting clobbered upR34x_v20100126
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
index c4205c06c..1bb9202cc 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
@@ -68,7 +68,7 @@ public class EclipseLauncherParser {
if (launcherData.getJvm() != null) {
lines.add(EquinoxConstants.OPTION_VM);
- lines.add(launcherData.getJvm().getAbsolutePath());
+ lines.add(launcherData.getJvm().getPath());
}
final String[] jvmArgs = launcherData.getJvmArgs();
if (jvmArgs != null && jvmArgs.length != 0) {
@@ -157,9 +157,9 @@ public class EclipseLauncherParser {
} else if (line.equalsIgnoreCase(EquinoxConstants.OPTION_VM)) {
final String nextLine = lines[++i].trim();
File file = new File(nextLine);
- if (!file.isAbsolute()) {
- file = new File(launcherConfigFile.getAbsolutePath() + File.separator + nextLine);
- }
+ // if (!file.isAbsolute()) {
+ // file = new File(launcherConfigFile.getAbsolutePath() + File.separator + nextLine);
+ // }
launcherData.setJvm(file);
continue;
} else if (line.equalsIgnoreCase(EquinoxConstants.OPTION_FW)) {

Back to the top