mbenson 2005/02/11 14:49:56
Modified: src/main/org/apache/tools/ant DirectoryScanner.java
Log:
Unfinished caching of IllegalStateExceptions for concurrent scan()
invocations.
Revision Changes Path
1.90 +6 -3 ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- DirectoryScanner.java 11 Feb 2005 22:41:40 -0000 1.89
+++ DirectoryScanner.java 11 Feb 2005 22:49:56 -0000 1.90
@@ -772,16 +772,19 @@
excludes = nullExcludes ? new String[0] : excludes;
if (basedir == null) {
- throw new IllegalStateException("No basedir set");
+ illegal = new IllegalStateException("No basedir set");
}
if (!basedir.exists()) {
- throw new IllegalStateException("basedir " + basedir
+ illegal = new IllegalStateException("basedir " + basedir
+ " does not exist");
}
if (!basedir.isDirectory()) {
- throw new IllegalStateException("basedir " + basedir
+ illegal = new IllegalStateException("basedir " + basedir
+ " is not a directory");
}
+ if (illegal != null) {
+ throw illegal;
+ }
if (isIncluded("")) {
if (!isExcluded("")) {
if (isSelected("", basedir)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
