[jboss-cvs] JBossAS SVN: r102293 - projects/vfs/trunk/src/main/java/org/jboss/vfs.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2010-03-11 10:18:56 -0500 (Thu, 11 Mar 2010)
New Revision: 102293

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/vfs/VFSUtils.java
Log:
Even better way

Modified: projects/vfs/trunk/src/main/java/org/jboss/vfs/VFSUtils.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/vfs/VFSUtils.java	2010-03-11 15:17:51 UTC (rev 102292)
+++ projects/vfs/trunk/src/main/java/org/jboss/vfs/VFSUtils.java	2010-03-11 15:18:56 UTC (rev 102293)
@@ -836,7 +836,9 @@
         StringBuilder patternBuilder = new StringBuilder();
         patternBuilder.append("^");
         final Matcher m = GLOB_PATTERN.matcher(glob);
+        boolean lastWasSlash = false;
         while (m.find()) {
+            lastWasSlash = false;
             String grp;
             if ((grp = m.group(1)) != null) {
                 // match a * or **
@@ -856,12 +858,13 @@
             } else if ((grp = m.group(4)) != null) {
                 // match any number of / chars
                 patternBuilder.append("/+");
+                lastWasSlash = true;
             } else {
                 // some other string
                 patternBuilder.append(Pattern.quote(m.group()));
             }
         }
-        if (glob.charAt(glob.length() - 1) == '/') {
+        if (lastWasSlash) {
             // ends in /, append **
             patternBuilder.append(".*");
         }