diff --git a/src/etc/testcases/filters/build.xml b/src/etc/testcases/filters/build.xml
new file mode 100644
index 000000000..f19c6595d
--- /dev/null
+++ b/src/etc/testcases/filters/build.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<project default="cleanup" basedir=".">
+
+  <target name="init">
+    <mkdir dir="result" />
+  </target>
+
+  <target name="cleanup">
+    <delete dir="result" />
+  </target>
+
+  <target name="testLineContains" depends="init">
+    <copy todir="result">
+      <fileset dir="input"/>
+      <filterchain>
+        <filterreader classname="org.apache.tools.ant.filters.LineContains">
+          <param type="contains" value="beta"/>
+        </filterreader>
+      </filterchain>
+    </copy>
+  </target>
+
+</project>
diff --git a/src/etc/testcases/filters/expected/linecontains.test b/src/etc/testcases/filters/expected/linecontains.test
new file mode 100644
index 000000000..75a94b55b
--- /dev/null
+++ b/src/etc/testcases/filters/expected/linecontains.test
@@ -0,0 +1 @@
+This is line 2 with beta.
diff --git a/src/etc/testcases/filters/input/linecontains.test b/src/etc/testcases/filters/input/linecontains.test
new file mode 100644
index 000000000..2600cdb1f
--- /dev/null
+++ b/src/etc/testcases/filters/input/linecontains.test
@@ -0,0 +1,3 @@
+This is line 1 with alpha.
+This is line 2 with beta.
+This is line 3 with gamma.
diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java
index 994833dce..552ea74aa 100644
--- a/src/main/org/apache/tools/ant/filters/LineContains.java
+++ b/src/main/org/apache/tools/ant/filters/LineContains.java
@@ -142,20 +142,21 @@ public final class LineContains
                 line = line.substring(1);
             }
         } else {
-            String goodLine = null;
             line = readLine();
-            while((line != null) && (goodLine == null)) {
-                goodLine = line;
-                int containsSize = contains.size();
+            if (line == null) {
+                ch = -1;
+            } else {
+                final int containsSize = contains.size();
                 for (int i = 0; i < containsSize; i++) {
                     String containsStr = (String) contains.elementAt(i);
                     if (line.indexOf(containsStr) == -1) {
-                        goodLine = null;
+                        line = null;
                         break;
                     }
                 }
+
                 return read();
-            };
+            }
         }
 
         return ch;
diff --git a/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java b/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java
new file mode 100644
index 000000000..3e4040a1a
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java
@@ -0,0 +1,87 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.filters;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+/**
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ */
+public class LineContainsTest extends BuildFileTest {
+
+    public LineContainsTest(String name) {
+        super(name);
+    }
+
+    public void setUp() { 
+        configureProject("src/etc/testcases/filters/build.xml");
+    }
+    
+    public void tearDown() { 
+        executeTarget("cleanup");
+    }
+    
+    public void testLineContains() throws IOException { 
+        executeTarget("testLineContains");
+        File expected = getProject().resolveFile("expected/linecontains.test");
+        File result = getProject().resolveFile("result/linecontains.test");
+        assertTrue(FileUtils.newFileUtils().contentEquals(expected, result));
+    }
+    
+}