svn commit: r735080 - in /ant/core/trunk/src/main/org/apache/tools/ant/types/resources: BaseResourceCollectionContainer.java Resources.java

[mbenson]

Author: mbenson
Date: Fri Jan 16 10:31:01 2009
New Revision: 735080

URL: http://svn.apache.org/viewvc?rev=735080&view=rev
Log:
restore stuff accidentally blown away

Modified:
    
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
    ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java?rev=735080&r1=735079&r2=735080&view=diff
==============================================================================
--- 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
 Fri Jan 16 10:31:01 2009
@@ -28,6 +28,7 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 
 /**
@@ -173,7 +174,8 @@
         /* now check each Resource in case the child only
            lets through files from any children IT may have: */
         for (Iterator i = cacheCollection().iterator(); i.hasNext();) {
-            if (!(i.next() instanceof FileProvider)) {
+            Resource r = (Resource) i.next();
+            if (r.as(FileProvider.class) == null) {
                 return false;
             }
         }
@@ -198,9 +200,7 @@
             for (Iterator i = rc.iterator(); i.hasNext();) {
                 Object o = i.next();
                 if (o instanceof DataType) {
-                    stk.push(o);
-                    invokeCircularReferenceCheck((DataType) o, stk, p);
-                    stk.pop();
+                    pushAndInvokeCircularReferenceCheck((DataType) o, stk, p);
                 }
             }
             setChecked(true);

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java?rev=735080&r1=735079&r2=735080&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java 
Fri Jan 16 10:31:01 2009
@@ -115,6 +115,7 @@
 
     /**
      * Create a new Resources.
+     * @since Ant 1.8
      */
     public Resources(Project project) {
         setProject(project);
@@ -221,7 +222,7 @@
             for (Iterator i = getNested().iterator(); i.hasNext();) {
                 Object o = i.next();
                 if (o instanceof DataType) {
-                    invokeCircularReferenceCheck((DataType) o, stk, p);
+                    pushAndInvokeCircularReferenceCheck((DataType) o, stk, p);
                 }
             }
             setChecked(true);