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

[Marc Cardle]

mcardle     2005/12/23 01:50:56 CET

  Modified files:
    core/src/java/org/jahia/services/esi 
                                         EsiInvalidationEventListener.java 
  Log:
  * deals with null events
  
  Revision  Changes    Path
  1.12      +5 -1      
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.11&r2=1.12&f=h
  
  
  
  Index: EsiInvalidationEventListener.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- EsiInvalidationEventListener.java 23 Dec 2005 00:47:37 -0000      1.11
  +++ EsiInvalidationEventListener.java 23 Dec 2005 00:50:55 -0000      1.12
  @@ -485,18 +485,21 @@
       }
   
       public void templateUpdated( JahiaEvent je ) {
  +        if (je==null) return;
           //TODO: make this more selective !
           //Clear the ESI server cache
           logger.warn("templateUpdated event detected so Clearing the whole 
ESI server cache (temporary fix)");
           
EsiSOAPInvalidation.emptyEsiServerCache(je.getJahiaData().getProcessingContext().settings());
       }
       public void rightsSet( JahiaEvent je) {
  +        if (je==null) return;
           //TODO: make this more selective !
           //Clear the ESI server cache
           logger.warn("rightsSet event detected so Clearing the whole ESI 
server cache (temporary fix)");
           
EsiSOAPInvalidation.emptyEsiServerCache(je.getJahiaData().getProcessingContext().settings());
       }
       public void pageAdded( JahiaEvent je ) {
  +        if (je==null) return;
           //TODO: make this more selective !
           //Clear the ESI server cache
           logger.warn("pageAdded event detected so Clearing the whole ESI 
server cache (temporary fix)");
  @@ -504,7 +507,8 @@
       }
   
       public void fileManagerAclChanged (JahiaEvent theEvent) {
  -        //TODO: make this more selective !
  +        if (theEvent==null) return;
  +        // /TODO: make this more selective !
           //Clear the ESI server cache
           logger.warn("fileManagerAclChanged event detected so Clearing the 
whole ESI server cache (temporary fix)");
           
EsiSOAPInvalidation.emptyEsiServerCache(theEvent.getJahiaData().getProcessingContext().settings());