prussell 01/01/18 11:12:12
Modified: src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 JavaLanguage.java
Log:
Added trapping for attempts to list non-directories.
Revision Changes Path
No revision
No revision
1.1.2.17 +8 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- JavaLanguage.java 2000/12/11 15:06:02 1.1.2.16
+++ JavaLanguage.java 2001/01/18 19:12:09 1.1.2.17
@@ -31,7 +31,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2000/12/11 15:06:02 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/01/18 19:12:09 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe {
@@ -258,8 +258,14 @@
return buffer.toString();
}
- private String expandDirs(String d) {
+ private String expandDirs(String d) throws LanguageException {
File dir = new File(d);
+ if ( ! dir.isDirectory() ) {
+ throw new LanguageException(
+ "Attempted to retrieve directory listing of
non-directory "
+ + dir.toString()
+ );
+ }
File[] files = dir.listFiles(new JavaArchiveFilter());
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < files.length; i++) {
