diff options
| author | Andrew Niefer | 2010-08-23 18:41:55 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2010-08-23 18:41:55 +0000 |
| commit | 0cee85f81da0c5bd1411bc5b4248a669c66031cd (patch) | |
| tree | 41bee530db0face83f47cbefe128244217e1a391 /bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java | |
| parent | 51443e77ddc3e84079b600511dc7ddd317d0a751 (diff) | |
| download | rt.equinox.framework-0cee85f81da0c5bd1411bc5b4248a669c66031cd.tar.gz rt.equinox.framework-0cee85f81da0c5bd1411bc5b4248a669c66031cd.tar.xz rt.equinox.framework-0cee85f81da0c5bd1411bc5b4248a669c66031cd.zip | |
bug 323422 - [launcher] --launcher.overrideVmargs/appendVmArgs incorrectly consumed
Diffstat (limited to 'bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java index 099686cdc..d8f85eb3e 100644 --- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java @@ -138,8 +138,8 @@ public class Main { private static final String NAME = "-name"; //$NON-NLS-1$ private static final String LAUNCHER = "-launcher"; //$NON-NLS-1$ private static final String LIBRARY = "--launcher.library"; //$NON-NLS-1$ - private static final String APPEND_VMARGS = "--launcher.appendVmargs"; - private static final String OVERRIDE_VMARGS = "--launcher.overrideVmargs"; + private static final String APPEND_VMARGS = "--launcher.appendVmargs"; //$NON-NLS-1$ + private static final String OVERRIDE_VMARGS = "--launcher.overrideVmargs"; //$NON-NLS-1$ private static final String NL = "-nl"; //$NON-NLS-1$ private static final String ENDSPLASH = "-endsplash"; //$NON-NLS-1$ private static final String SPLASH_IMAGE = "splash.bmp"; //$NON-NLS-1$ @@ -1492,6 +1492,11 @@ public class Main { found = true; } + //just consume the --launcher.overrideVmargs and --launcher.appendVmargs + if (args[i - 1].equalsIgnoreCase(APPEND_VMARGS) || args[i - 1].equalsIgnoreCase(OVERRIDE_VMARGS)) { + found = true; + } + // check if this is initialization pass if (args[i].equalsIgnoreCase(INITIALIZE)) { initialize = true; @@ -1623,11 +1628,6 @@ public class Main { found = true; } - //just consume the --launcher.overrideVmargs and --launcher.appendVmargs - if (args[i - 1].equalsIgnoreCase(APPEND_VMARGS) || args[i - 1].equalsIgnoreCase(OVERRIDE_VMARGS)) { - found = true; - } - if (args[i - 1].equalsIgnoreCase(LIBRARY)) { library = arg; found = true; |