Bug 253862 [fwkAdmin] Remove program argument need to specify a number of arguments

1 files changed, 19 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java
index a5dcb34d8..914be985a 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java
@@ -137,7 +137,25 @@ public class LauncherData {
 	}
 
 	public void removeProgramArg(String arg) {
-		programArgs.remove(arg);
+		// We want to handle program args as key/value pairs subsequently 
+		// a key MUST start with a "-", all other args are ignored. For 
+		// backwards compatibility we remove all program args until the 
+		// next program arg key 
+		// (see bug 253862)
+		if (!arg.startsWith("-"))
+			return;
+
+		int index = programArgs.indexOf(arg);
+		if (index == -1)
+			return;
+
+		programArgs.remove(index);
+		while (index < programArgs.size()) {
+			String next = (String) programArgs.get(index);
+			if (next.charAt(0) == '-')
+				return;
+			programArgs.remove(index);
+		}
 	}
 
 	public void setFwConfigLocation(File fwConfigLocation) {