harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r418840 - /incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java
Date Mon, 03 Jul 2006 20:28:51 GMT
Author: tellison
Date: Mon Jul  3 13:28:50 2006
New Revision: 418840

URL: http://svn.apache.org/viewvc?rev=418840&view=rev
Log:
Apply patch HARMONY-674 (Pattern throws ArrayIndexOutOfBoundsException when mathching regexp)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java?rev=418840&r1=418839&r2=418840&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/NonCapFSet.java
Mon Jul  3 13:28:50 2006
@@ -36,14 +36,9 @@
             MatchResultImpl matchResult) {
 
         int gr = getGroupIndex();
-        int end = matchResult.getEnd(gr);
         matchResult.setConsumed(gr, stringIndex - matchResult.getConsumed(gr));
 
-        int shift = next.matches(stringIndex, testString, matchResult);
-
-        if (shift < 0)
-            matchResult.setEnd(gr, end);
-        return shift;
+        return next.matches(stringIndex, testString, matchResult);
     }
 
     protected String getName() {
@@ -53,4 +48,4 @@
     public boolean hasConsumed(MatchResultImpl mr) {
         return false;
     }
-}
\ No newline at end of file
+}



Mime
View raw message