ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matt Benson <gudnabr...@yahoo.com>
Subject Re: svn commit: r734864 - in /ant/core/trunk/src: main/org/apache/tools/ant/taskdefs/ main/org/apache/tools/ant/types/resources/ tests/antunit/types/resources/comparators/
Date Fri, 16 Jan 2009 16:09:27 GMT

--- Stefan Bodewig <bodewig@apache.org> wrote:

> On 2009-01-16, <mbenson@apache.org> wrote:
> 
> > Modified:
>
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
> > @@ -159,8 +173,7 @@
> >          /* 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();) {
> > -            Resource r = (Resource) i.next();
> > -            if (r.as(FileProvider.class) == null)
> {
> > +            if (!(i.next() instanceof
> FileProvider)) {
> >                  return false;
> >              }
> >          }
> > @@ -185,7 +198,9 @@
> >              for (Iterator i = rc.iterator();
> i.hasNext();) {
> >                  Object o = i.next();
> >                  if (o instanceof DataType) {
> > -                   
> pushAndInvokeCircularReferenceCheck((DataType) o,
> stk, p);
> > +                    stk.push(o);
> > +                   
> invokeCircularReferenceCheck((DataType) o, stk, p);
> > +                    stk.pop();
> >                  }
> >              }
> >              setChecked(true);
> 
> and
> 
> > Modified:
>
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
> > @@ -208,7 +221,7 @@
> >              for (Iterator i =
> getNested().iterator(); i.hasNext();) {
> >                  Object o = i.next();
> >                  if (o instanceof DataType) {
> > -                   
> pushAndInvokeCircularReferenceCheck((DataType) o,
> stk, p);
> > +                   
> invokeCircularReferenceCheck((DataType) o, stk, p);
> >                  }
> >              }
> >              setChecked(true);
> 
> Looks as if you had reverted some of my changes from
> last year, have
> they been causing problems?

Ugh... no, this would be an artifact of the
workspace-switching I went through yesterday while
trying to work through the xalan issue.  Apparently I
didn't have something up to date; will correct!

Thanks,
Matt

> 
> Stefan
> 
>
---------------------------------------------------------------------
> To unsubscribe, e-mail:
> dev-unsubscribe@ant.apache.org
> For additional commands, e-mail:
> dev-help@ant.apache.org
> 
> 



      

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message