sebb 2005/02/21 16:03:53
Modified: src/jorphan/org/apache/commons/cli/avalon Tag: rel-2_0
CLArgsParser.java
Log:
Fix -D arg1=arg2 parsing bug
Revision Changes Path
No revision
No revision
1.1.2.4 +11 -1
jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/Attic/CLArgsParser.java
Index: CLArgsParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/Attic/CLArgsParser.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CLArgsParser.java 20 Feb 2005 23:52:40 -0000 1.1.2.3
+++ CLArgsParser.java 22 Feb 2005 00:03:53 -0000 1.1.2.4
@@ -676,6 +676,16 @@
{
if( 0 == m_option.getArgumentCount() )
{
+ /*
+ * Fix bug: -D arg1=arg2 was causing parse
error; however --define arg1=arg2 is OK
+ * This seems to be because the parser skips
the terminator for the long options,
+ * but was not doing so for the short options.
+ */
+ if (!m_isLong){
+ if (0 == peekAtChar()){
+ getChar();
+ }
+ }
final Token token = nextToken( ARG_SEPARATORS );
if( TOKEN_SEPARATOR == token.getType() )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]