svn commit: r1188876 - /incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/URLFiltersFactory.java

[javier]

Author: javier
Date: Tue Oct 25 19:31:29 2011
New Revision: 1188876

URL: http://svn.apache.org/viewvc?rev=1188876&view=rev
Log:
Code refactorization. DROIDS-149

Modified:
    
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/URLFiltersFactory.java

Modified: 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/URLFiltersFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/URLFiltersFactory.java?rev=1188876&r1=1188875&r2=1188876&view=diff
==============================================================================
--- 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/URLFiltersFactory.java
 (original)
+++ 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/URLFiltersFactory.java
 Tue Oct 25 19:31:29 2011
@@ -35,13 +35,8 @@ public class URLFiltersFactory extends G
    */
   public boolean accept(String urlString) {
     for (String key : getMap().keySet()) {
-      if (urlString == null) {
-        return false;
-      }
-      URLFilter filter = getMap().get(key);
-      urlString = filter.filter(urlString);
-      if (urlString == null) {
-        return false;
+      if(!accept(urlString, key)) {
+       return false;
       }
     }
     return true;
@@ -60,8 +55,7 @@ public class URLFiltersFactory extends G
     if (urlString == null) {
       return false;
     }
-    URLFilter filter = getMap().get(filterName);
-    urlString = filter.filter(urlString);
+    urlString = getMap().get(filterName).filter(urlString);
     if (urlString == null) {
       return false;
     }