diff options
| author | Chris Burdess <dog@bluezoo.org> | 2006-02-25 10:53:05 +0000 |
|---|---|---|
| committer | Chris Burdess <dog@bluezoo.org> | 2006-02-25 10:53:05 +0000 |
| commit | ec4b60b20cc9d60c2260bb776e9118b041a3ee70 (patch) | |
| tree | daacd486963c04d0f319cf1de849268f51dd766b /gnu/xml/stream/CRLFReader.java | |
| parent | 3ef6532f9b2e875cfec2f09a141a2f1cbba1651c (diff) | |
| download | classpath-ec4b60b20cc9d60c2260bb776e9118b041a3ee70.tar.gz | |
2006-02-25 Chris Burdess <dog@gnu.org>generics-merge-20060225
* gnu/java/net/CRLFInputStream.java,
gnu/java/net/LineInputStream.java: Streams that use mark
capabilities on the underlying stream do not expose mark
functionality themselves.
* gnu/xml/stream/CRLFReader.java: Fix incorrect end condition when
off > 0.
Diffstat (limited to 'gnu/xml/stream/CRLFReader.java')
| -rw-r--r-- | gnu/xml/stream/CRLFReader.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/xml/stream/CRLFReader.java b/gnu/xml/stream/CRLFReader.java index 1d214ce52..dad02b94a 100644 --- a/gnu/xml/stream/CRLFReader.java +++ b/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; |