From 16be80c8a5f23b134443559833bc4067cef20fba Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Mon, 14 May 2007 15:24:44 +0000 Subject: [PATCH] fix failing test git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@537876 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/condition/ResourceContains.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java index de4d2bcba..8f122d742 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java @@ -80,18 +80,14 @@ public class ResourceContains implements Condition { try { reader = new BufferedReader(new InputStreamReader(resource.getInputStream())); String contents = FileUtils.readFully(reader); - if (casesensitive) { - if (contents.indexOf(substring) > -1) { - return true; - } - } else { - if (contents.toLowerCase().indexOf(substring) > -1) { - return true; - } + String sub = substring; + if (!casesensitive) { + contents = contents.toLowerCase(); + sub = sub.toLowerCase(); } - return false; + return contents.indexOf(sub) >= 0; } catch (IOException e) { - throw new BuildException("There was a problem accessing resource : "+resource); + throw new BuildException("There was a problem accessing resource : " + resource); } finally { FileUtils.close(reader); }