cvs commit: esi_server/src/org/jahia/esi/cache CacheAdminstrator.java

[Marc Cardle]

mcardle     2005/11/18 17:21:46 CET

  Modified files:
    src/org/jahia/esi/cache CacheAdminstrator.java 
  Log:
  * deals properly with static requesthandler
  
  Revision  Changes    Path
  1.3       +3 -5      esi_server/src/org/jahia/esi/cache/CacheAdminstrator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/cache/CacheAdminstrator.java.diff?r1=1.2&r2=1.3&f=h
  
  
  
  Index: CacheAdminstrator.java
  ===================================================================
  RCS file: 
/home/cvs/repository/esi_server/src/org/jahia/esi/cache/CacheAdminstrator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CacheAdminstrator.java    2 Nov 2005 15:50:13 -0000       1.2
  +++ CacheAdminstrator.java    18 Nov 2005 16:21:46 -0000      1.3
  @@ -48,23 +48,21 @@
       /**
       * Generates a cache entry key.
       */
  -    public String generateEntryKey(RequestHandler requestHandler) {
  +    public String generateEntryKey(HttpServletRequest clientRequest, URL 
clientRequestURL) {
           /**
           * Used for generating cache entry keys.
           */
           StringBuffer cBuffer = new StringBuffer(AVERAGE_KEY_LENGTH);
   
   
  -        
cBuffer.append("_").append(requestHandler.getClientRequest().getMethod()).append("_");
  -
  -        URL reqUrl = requestHandler.getClientRequestURL();
  +        cBuffer.append("_").append(clientRequest.getMethod()).append("_");
   
           //reqUrl.getHOST()
   
           //reqUrl.
                   // [scheme:][//authority][path][?query][#fragment]
   
  -        cBuffer.append(reqUrl);
  +        cBuffer.append(clientRequestURL.toString());
   
           return cBuffer.toString();
       }