cvs commit: jahia/src/java/org/jahia/services/sites JahiaSitesSlideService.java

[Thomas Draier]

tdraier     2004/10/08 12:06:25 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/sites JahiaSitesSlideService.java 
  Log:
  fixed cache listener when creating virtual sites
  
  Revision  Changes    Path
  1.5.4.5   +5 -3      
jahia/src/java/org/jahia/services/sites/JahiaSitesSlideService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/sites/JahiaSitesSlideService.java.diff?r1=1.5.4.4&r2=1.5.4.5&f=h
  
  
  
  Index: JahiaSitesSlideService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/sites/Attic/JahiaSitesSlideService.java,v
  retrieving revision 1.5.4.4
  retrieving revision 1.5.4.5
  diff -u -r1.5.4.4 -r1.5.4.5
  --- JahiaSitesSlideService.java       7 Oct 2004 13:44:30 -0000       1.5.4.4
  +++ JahiaSitesSlideService.java       8 Oct 2004 10:06:25 -0000       1.5.4.5
  @@ -155,9 +155,11 @@
       public void onCachePut(String cacheName, Object entryKey, Object entryValue) {
           super.onCachePut(cacheName, entryKey, entryValue);
   
  -        JahiaSite site = (JahiaSite) ((CacheEntry) entryValue).getObject();
  -        if (domain.getNamespace(site.getSiteKey()) == null) {
  -            domain.addNamespace (site.getSiteKey (), logger, defs, conf, data);
  +        if (entryValue != null && ((CacheEntry)entryValue).getObject() !=null) {
  +            JahiaSite site = (JahiaSite) ((CacheEntry) entryValue).getObject();
  +            if (domain.getNamespace(site.getSiteKey()) == null) {
  +                domain.addNamespace (site.getSiteKey (), logger, defs, conf, data);
  +            }
           }
       }
   }