You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2009/04/14 15:07:52 UTC

svn commit: r764767 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java

Author: tellison
Date: Tue Apr 14 13:07:52 2009
New Revision: 764767

URL: http://svn.apache.org/viewvc?rev=764767&view=rev
Log:
Apply patch for HARMONY-6147 ([classlib][luni] java.util.Scanner.test_nextLine() failed on a regression testcase)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java?rev=764767&r1=764766&r2=764767&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java Tue Apr 14 13:07:52 2009
@@ -1394,7 +1394,8 @@
         String result = null;
         while (true) {
             if (matcher.find()) {
-                if (inputExhausted || matcher.end() != bufferLength) {
+                if (inputExhausted || matcher.end() != bufferLength
+                        || bufferLength < buffer.capacity()) {
                     matchSuccessful = true;
                     findStartIndex = matcher.end();
                     result = matcher.group();