cvs commit: jahia/core/src/java/org/jahia/services/esi EsiInvalidationEventListener.java

[Marc Cardle]

mcardle     2006/01/06 18:24:44 CET

  Modified files:
    core/src/java/org/jahia/services/esi 
                                         EsiInvalidationEventListener.java 
  Log:
  * doesn't display warn messages in non-ESI mode
  
  Revision  Changes    Path
  1.16      +7 -0      
jahia/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java.diff?r1=1.15&r2=1.16&f=h
  
  
  
  Index: EsiInvalidationEventListener.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- EsiInvalidationEventListener.java 6 Jan 2006 01:21:46 -0000       1.15
  +++ EsiInvalidationEventListener.java 6 Jan 2006 17:24:44 -0000       1.16
  @@ -510,6 +510,13 @@
           if 
(ServicesRegistry.getInstance().getEsiService().isEmptyEsiCacheRequested())
               return;
   
  +        JahiaData jd = je.getJahiaData();
  +        if (jd==null) return;
  +        ProcessingContext pc = jd.getProcessingContext();
  +        if (pc==null) return;
  +        if (! pc.settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED))
  +            return;
  +
           
ServicesRegistry.getInstance().getEsiService().setEmptyEsiCacheRequested(true);
           logger.warn(eventFct+" event detected so Clearing the whole ESI 
server cache (temporary fix). For JahiaEvent"+je.getObject());
       }