From 4ff6d329e5e5587a3fdc1ec98eb62713b996beb4 Mon Sep 17 00:00:00 2001 From: Magesh Umasankar Date: Thu, 28 Feb 2002 00:44:00 +0000 Subject: [PATCH] Empty line check inserted. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271593 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/org/apache/tools/ant/filters/LineContains.java | 1 - .../main/org/apache/tools/ant/filters/PrefixLines.java | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java index 99e974739..12b339e85 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java @@ -157,7 +157,6 @@ public final class LineContains for (int i = 0; i < containsSize; i++) { String containsStr = (String) contains.elementAt(i); if (line.indexOf(containsStr) == -1) { - System.out.println("Hello"); line = null; break; } diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java index b6622bd69..484d54f3d 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java @@ -127,12 +127,15 @@ public final class PrefixLines int ch = -1; + if (queuedData != null && queuedData.length() == 0) { + queuedData = null; + } + if (queuedData != null) { + ch = queuedData.charAt(0); + queuedData = queuedData.substring(1); if (queuedData.length() == 0) { queuedData = null; - } else { - ch = queuedData.charAt(0); - queuedData = queuedData.substring(1); } } else { ch = in.read();