cvs commit: esi_server/src/org/jahia/esi/invalidation/services Invalidator.java

[Marc Cardle]

mcardle     2005/12/07 18:02:00 CET

  Modified files:
    src/org/jahia/esi/invalidation/services Invalidator.java 
  Log:
  * deals with null urls
  
  Revision  Changes    Path
  1.8       +5 -0      
esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java.diff?r1=1.7&r2=1.8&f=h
  
  
  
  Index: Invalidator.java
  ===================================================================
  RCS file: 
/home/cvs/repository/esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Invalidator.java  6 Dec 2005 14:43:03 -0000       1.7
  +++ Invalidator.java  7 Dec 2005 17:02:00 -0000       1.8
  @@ -476,6 +476,11 @@
                       String urlKey = (String) urlItid.next();
                       UrlCacheObject urlObj = (UrlCacheObject) 
urlCache.get(urlKey);
   
  +                     if (urlObj.getUrl()==null || 
"".equals(urlObj.getUrl())) {
  +                        log.error("Invalid UrlCacheObject.getUrl() value in 
matching process : " + urlObj);
  +                        continue;
  +                    }
  +                    
                       boolean validMatch = true;
   
                       Enumeration enumM = matchers.elements();