mbenson 2005/08/05 15:02:51
Modified: src/main/org/apache/tools/ant/types/resources Restrict.java
Log:
FailFast adjustments
Revision Changes Path
1.5 +4 -1
ant/src/main/org/apache/tools/ant/types/resources/Restrict.java
Index: Restrict.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/resources/Restrict.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Restrict.java 5 Aug 2005 18:07:11 -0000 1.4
+++ Restrict.java 5 Aug 2005 22:02:51 -0000 1.5
@@ -88,6 +88,9 @@
* @param s the ResourceSelector to add.
*/
public synchronized void add(ResourceSelector s) {
+ if (s == null) {
+ return;
+ }
super.add(s);
FailFast.invalidate(this);
}
@@ -101,7 +104,7 @@
return ((Restrict) getCheckedRef()).iterator();
}
dieOnCircularReference();
- return new FailFast(this, w.iterator());
+ return w.iterator();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
