Author: michiel
Date: 2010-05-10 15:44:40 +0200 (Mon, 10 May 2010)
New Revision: 42125
Modified:
mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java
Log:
regex should only match name part
Modified: mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java
2010-05-10 13:43:35 UTC (rev 42124)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java
2010-05-10 13:44:40 UTC (rev 42125)
@@ -1230,9 +1230,10 @@
}
private Set<String> getPaths(final Set<String> results, final Pattern
pattern, final String recursive, final boolean directories) {
FilenameFilter filter = new FilenameFilter() {
+ @Override
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);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
