geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r980317 - /geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/URLPattern.java
Date Thu, 29 Jul 2010 05:54:33 GMT
Author: gawor
Date: Thu Jul 29 05:54:33 2010
New Revision: 980317

URL: http://svn.apache.org/viewvc?rev=980317&view=rev
Log:
restore old code which seems to work better

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/URLPattern.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/URLPattern.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/URLPattern.java?rev=980317&r1=980316&r2=980317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/URLPattern.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/URLPattern.java
Thu Jul 29 05:54:33 2010
@@ -76,21 +76,20 @@ public class URLPattern {
         if (type == EXACT) {
             return pattern;
         } else {
-            //HashSet<String> bucket = new HashSet<String>();
+            HashSet<String> bucket = new HashSet<String>();
             StringBuilder result = new StringBuilder(pattern);
+            
             // Collect a set of qualifying patterns, depending on the type of this pattern.
             for (URLPattern p : patterns) {
                 if (type.check(this, p)) {
-                    //bucket.add(p.pattern);
-                    result.append(':');
-                    result.append(p.pattern);
+                    bucket.add(p.pattern);
                 }
             }
             // append the set of qualifying patterns
-            /*for (String aBucket : bucket) {
+            for (String aBucket : bucket) {
                 result.append(':');
                 result.append(aBucket);
-            }*/
+            }
             return result.toString();
         }
     }



Mime
View raw message