Bug 197013 - [server] console command line parsing problem in FrameworkLauncher

1 files changed, 22 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/FrameworkLauncher.java b/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/FrameworkLauncher.java
index 0035c7642..2c4b32a62 100644
--- a/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/FrameworkLauncher.java
+++ b/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/FrameworkLauncher.java
@@ -403,15 +403,29 @@ public class FrameworkLauncher {
 			while (tokenizer.hasMoreTokens()) {
 				String arg = tokenizer.nextToken();
 				if (arg.startsWith("\"")) { //$NON-NLS-1$
-					String remainingArg = tokenizer.nextToken("\""); //$NON-NLS-1$
-					arg = arg.substring(1) + remainingArg;
-					// skip to next whitespace separated token
-					tokenizer.nextToken(WS_DELIM);
+					if (arg.endsWith("\"")) { //$NON-NLS-1$ 
+		 				if (arg.length() >= 2) {
+		 					// strip the beginning and ending quotes 
+		 					arg = arg.substring(1, arg.length() - 1);
+		 				}
+		 			} else {
+						String remainingArg = tokenizer.nextToken("\""); //$NON-NLS-1$
+						arg = arg.substring(1) + remainingArg;
+						// skip to next whitespace separated token
+						tokenizer.nextToken(WS_DELIM);
+		 			}
 				} else if (arg.startsWith("'")) { //$NON-NLS-1$
-					String remainingArg = tokenizer.nextToken("'"); //$NON-NLS-1$
-					arg = arg.substring(1) + remainingArg;
-					// skip to next whitespace separated token
-					tokenizer.nextToken(WS_DELIM);
+		 			if (arg.endsWith("'")) { //$NON-NLS-1$ 
+		 				if (arg.length() >= 2) {
+		 					// strip the beginning and ending quotes 
+		 					arg = arg.substring(1, arg.length() - 1);
+		 				}
+		 			} else {
+						String remainingArg = tokenizer.nextToken("'"); //$NON-NLS-1$
+						arg = arg.substring(1) + remainingArg;
+						// skip to next whitespace separated token
+						tokenizer.nextToken(WS_DELIM);
+		 			}
 				}
 				args.add(arg);
 			}