From e6041976b75330a9252776c9e54eabf03d959103 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Thu, 27 Sep 2007 11:05:21 +0000
Subject: [PATCH] remove a couple of inner assignments

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@579975 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/StreamPumper.java  | 6 +++++-
 src/main/org/apache/tools/ant/util/ReaderInputStream.java | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
index 05337605a..6de3fc090 100644
--- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
@@ -89,7 +89,11 @@ public class StreamPumper implements Runnable {
 
         int length;
         try {
-            while ((length = is.read(buf)) > 0 && !finish) {
+            while (true) {
+                length = is.read(buf);
+                if ((length <= 0) || finish) {
+                    break;
+                }
                 os.write(buf, 0, length);
                 if (autoflush) {
                     os.flush();
diff --git a/src/main/org/apache/tools/ant/util/ReaderInputStream.java b/src/main/org/apache/tools/ant/util/ReaderInputStream.java
index b800e559a..620af8d5c 100755
--- a/src/main/org/apache/tools/ant/util/ReaderInputStream.java
+++ b/src/main/org/apache/tools/ant/util/ReaderInputStream.java
@@ -130,7 +130,8 @@ public class ReaderInputStream extends InputStream {
 
         System.arraycopy(slack, begin, b, off, len);
 
-        if ((begin += len) >= slack.length) {
+        begin += len;
+        if (begin >= slack.length) {
             slack = null;
         }