Imported GNU Classpath 0.90

       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 4 deletions

diff --git a/libjava/classpath/gnu/xml/stream/CRLFReader.java b/libjava/classpath/gnu/xml/stream/CRLFReader.java
index 1d214ce52c1..dad02b94a1d 100644
--- a/libjava/classpath/gnu/xml/stream/CRLFReader.java
+++ b/libjava/classpath/gnu/xml/stream/CRLFReader.java
@@ -1,5 +1,5 @@
 /* CRLFReader.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -153,13 +153,14 @@ class CRLFReader
     throws IOException
   {
     doReset = false;
-    int lm1 = len - 1;
-    for (int i = off; i < len; i++)
+    int end = off + len;
+    int em1 = end - 1;
+    for (int i = off; i < end; i++)
       {
         if (b[i] == '\r') // CR
           {
             int d;
-            if (i == lm1)
+            if (i == em1)
               {
                 d = in.read();
                 doReset = true;