diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index 02dcf7d45..7008468fd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -853,7 +853,7 @@ public class FixCRLF extends MatchingTask {
                     ++eolcount;
                     eolStr.append('\r');
                     reader.mark(2);
-                    switch ((char)(ch = reader.read())) {
+                    switch ((ch = reader.read())) {
                     case '\r':
                         if ((char)(ch = reader.read()) == '\n') {
                             eolcount += 2;
@@ -864,6 +864,10 @@ public class FixCRLF extends MatchingTask {
                         ++eolcount;
                         eolStr.append('\n');
                         break;
+                    case -1:
+                        // don't reposition when we've reached the end
+                        // of the stream
+                        break;
                     default:
                         reader.reset();
                         break;