[dna-commits] DNA SVN: r1189 - trunk/dna-common/src/main/java/org/jboss/dna/common/text.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-09-03 10:52:15 -0400 (Thu, 03 Sep 2009)
New Revision: 1189

Modified:
   trunk/dna-common/src/main/java/org/jboss/dna/common/text/TokenStream.java
Log:
Corrected the TokenStream.matches(String,String...) method to properly handle the ANY_VALUE on the first match.

Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/text/TokenStream.java
===================================================================
--- trunk/dna-common/src/main/java/org/jboss/dna/common/text/TokenStream.java	2009-09-02 18:59:05 UTC (rev 1188)
+++ trunk/dna-common/src/main/java/org/jboss/dna/common/text/TokenStream.java	2009-09-03 14:52:15 UTC (rev 1189)
@@ -684,7 +684,7 @@
         ListIterator<Token> iter = tokens.listIterator(tokenIterator.previousIndex());
         if (!iter.hasNext()) return false;
         Token token = iter.next();
-        if (currentExpected != ANY_VALUE || !token.matches(currentExpected)) return false;
+        if (currentExpected != ANY_VALUE && !token.matches(currentExpected)) return false;
         for (String nextExpected : expectedForNextTokens) {
             if (!iter.hasNext()) return false;
             token = iter.next();