cvs commit: jahia/core/src/java/org/jahia/operations/valves EsiInvalidateValve.java

[Marc Cardle]

mcardle     2005/11/28 15:20:11 CET

  Modified files:
    core/src/java/org/jahia/operations/valves 
                                              EsiInvalidateValve.java 
  Log:
  * reviewed Fragment's contentID reference re-initialisation mechanism
  
  Revision  Changes    Path
  1.5       +4 -5      
jahia/core/src/java/org/jahia/operations/valves/EsiInvalidateValve.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/operations/valves/EsiInvalidateValve.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: EsiInvalidateValve.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/operations/valves/EsiInvalidateValve.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EsiInvalidateValve.java   7 Oct 2005 14:59:56 -0000       1.4
  +++ EsiInvalidateValve.java   28 Nov 2005 14:20:11 -0000      1.5
  @@ -88,7 +88,7 @@
   
           ParamBean paramBean = (ParamBean) context;  //using parambean since 
we need the getrealresponse() method, not present in porcessingContext
   
  -        if 
(paramBean.settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)
  +         if 
(paramBean.settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)
                   && ServicesRegistry.getInstance().getEsiService().
                   checkForAnyContentToInvalidate()) {
   
  @@ -99,7 +99,6 @@
               HashMap TempsToInvalidate =  (HashMap)objReturned[1];
               HashMap FragsToInvalidate =  (HashMap)objReturned[2];
   
  -
               //TODO: might wanna check if the current contenttype is of 
"charset=" type
               //since we don't want to add ESI commands to pics which will be 
ignored by ESI server
               if (invMessage != null) {
  @@ -120,8 +119,8 @@
                   //so that AOP will redetect all the contentIDs of these any 
Fragments/Templates
                   // during the execution of the
                   //the JSP page
  -                
ServicesRegistry.getInstance().getEsiService().emptyInvalidatedTemplates(TempsToInvalidate);
  -                
ServicesRegistry.getInstance().getEsiService().emptyInvalidatedFragments(FragsToInvalidate);
  +                //TODO:remove this:  
ServicesRegistry.getInstance().getEsiService().emptyInvalidatedTemplates(TempsToInvalidate);
  +                //TODO:remove this: 
ServicesRegistry.getInstance().getEsiService().emptyInvalidatedFragments(FragsToInvalidate);
   
               }
           }
  @@ -135,7 +134,7 @@
           strFinal.append("\n <!-- START of ESI invalidation message --> \n");
           strFinal.append("<pre>      \n");
           //TODO: REMOVE output=yes param. Only for debug purposes
  -        strFinal.append("<esi:invalidate output=\"yes\">      \n");
  +        strFinal.append("<esi:invalidate output=\"yes\">      \n");   
//outputs invalidation reponse to generated HTML
           //str.append("<esi:invalidate>      \n");
           strFinal.append(EsiInvalidation.addSOAPXMLWrapper(invMessage));
           strFinal.append("</esi:invalidate>      \n");