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 8f122d742..b7e70bf20 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.util.FileUtils;
@@ -34,10 +35,27 @@ import org.apache.tools.ant.util.FileUtils;
  */
 public class ResourceContains implements Condition {
 
+    private Project project;
     private String substring;
     private Resource resource;
     private boolean casesensitive = true;
 
+    /**
+     * Set this condition's Project.
+     * @param project Project
+     */
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
+    /**
+     * Get this condition's Project.
+     * @return Project
+     */
+    public Project getProject() {
+        return project;
+    }
+
     /**
      * Sets the resource to search
      * @param r
@@ -72,6 +90,13 @@ public class ResourceContains implements Condition {
                                      + "in <resourcecontains>");
         }
 
+        if (substring.length() == 0) {
+            if (getProject() != null) {
+                getProject().log("ResourceContains: substring is empty; returning true", Project.MSG_VERBOSE);
+            }
+            return true;
+        }
+
         if (resource.getSize() == 0) {
             return false;
         }