donaldp 2002/10/30 22:44:26
Modified: loader/src/java/org/apache/excalibur/loader/util
PathMatcher.java
Log:
Fix up minging from ant1 style pattern to perl pattern. It had previously
failed to match files with no directory
Revision Changes Path
1.2 +5 -3
jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/util/PathMatcher.java
Index: PathMatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/util/PathMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PathMatcher.java 30 Oct 2002 09:10:18 -0000 1.1
+++ PathMatcher.java 31 Oct 2002 06:44:26 -0000 1.2
@@ -171,10 +171,12 @@
}
else if( '*' == ch )
{
- if( ( i + 1 ) < size &&
- '*' == str.charAt( i + 1 ) )
+ if( ( i + 2 ) < size &&
+ '*' == str.charAt( i + 1 ) &&
+ '/' == str.charAt( i + 2 ) )
{
sb.append( "([^/]*/)*" );
+ i += 2;
}
else
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
