ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r374000 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Date Wed, 01 Feb 2006 05:45:57 GMT
Author: bodewig
Date: Tue Jan 31 21:45:55 2006
New Revision: 374000

URL: http://svn.apache.org/viewcvs?rev=374000&view=rev
Log:
skip non-directory entries in sourcepath

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java?rev=374000&r1=373999&r2=374000&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java Tue Jan 31 21:45:55
2006
@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -2102,11 +2102,17 @@
 
             String[] pathElements = sourcePath.list();
             for (int i = 0; i < pathElements.length; i++) {
-                DirSet ds = new DirSet();
-                ds.setDefaultexcludes(useDefaultExcludes);
-                ds.setDir(new File(pathElements[i]));
-                ds.createPatternSet().addConfiguredPatternset(ps);
-                dirSets.addElement(ds);
+                File dir = new File(pathElements[i]);
+                if (dir.isDirectory()) {
+                    DirSet ds = new DirSet();
+                    ds.setDefaultexcludes(useDefaultExcludes);
+                    ds.setDir(dir);
+                    ds.createPatternSet().addConfiguredPatternset(ps);
+                    dirSets.addElement(ds);
+                } else {
+                    log("Skipping " + pathElements[i]
+                        + " since it is no directory.", Project.MSG_WARN);
+                }
             }
         }
 



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


Mime
View raw message