Author: michiel
Date: 2010-05-10 15:43:35 +0200 (Mon, 10 May 2010)
New Revision: 42124
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ResourceLoader.java
Log:
regex should only match name part
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ResourceLoader.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ResourceLoader.java
2010-05-10 12:14:13 UTC (rev 42123)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ResourceLoader.java
2010-05-10 13:43:35 UTC (rev 42124)
@@ -1224,7 +1224,7 @@
FilenameFilter filter = new FilenameFilter() {
public boolean accept(File dir, String name) {
File f = new File(dir, name);
- return pattern == null || (f.isDirectory() &&
recursive != null) || pattern.matcher(f.toString()).matches();
+ return pattern == null || (f.isDirectory() &&
recursive != null) || pattern.matcher(name).matches();
}
};
File f = getFile(recursive);
@@ -1233,7 +1233,9 @@
File [] files = f.listFiles(filter);
if (files == null) return results;
for (File element : files) {
- if (element.getName().equals("")) continue;
+ if (element.getName().equals("")) {
+ continue;
+ }
if (recursive != null && element.isDirectory()) {
getPaths(results, pattern, recursive +
element.getName() + "/", directories);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
