cvs commit: jahia/core/src/java/org/jahia/hibernate/manager JahiaContainerManager.java JahiaFieldsDataManager.java

[Cedric Mailleux]

cmailleux    2005/08/03 12:37:23 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/manager 
                                              JahiaContainerManager.java 
                                              JahiaFieldsDataManager.java 
  Log:
  Call cache.remove method instaed of flushGroup for cache that do not have 
group key
  
  Revision  Changes    Path
  1.6       +1 -1      
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java.diff?r1=1.5&r2=1.6&f=h
  1.6       +6 -5      
jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: JahiaContainerManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JahiaContainerManager.java        2 Aug 2005 09:11:29 -0000       1.5
  +++ JahiaContainerManager.java        3 Aug 2005 10:37:23 -0000       1.6
  @@ -513,7 +513,7 @@
       private void flushCache(int id) {
           Cache cache = cacheService.getCache(CACHE_NAME);
           if(cache != null) {
  -            cache.flushGroup(CACHE_KEY_PREFIX+id);
  +            cache.remove(CACHE_KEY_PREFIX+id);
           }
       }
   }
  
  
  
  Index: JahiaFieldsDataManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JahiaFieldsDataManager.java       2 Aug 2005 09:11:29 -0000       1.5
  +++ JahiaFieldsDataManager.java       3 Aug 2005 10:37:23 -0000       1.6
  @@ -93,7 +93,7 @@
       private void flushCache(int id) {
           Cache cache = cacheService.getCache(CACHE_NAME);
           if(cache != null) {
  -            cache.flushGroup(CACHE_KEY_PREFIX+id);
  +            cache.remove(CACHE_KEY_PREFIX+id);
           }
       }
   
  @@ -199,10 +199,11 @@
       }
   
       public void deleteEntry(int id, EntryStateable entryState) {
  -        dao.deleteJahiaField(
  -                dao.findJahiaFieldsDataByPK(
  -                        new JahiaFieldsDataPK(new Integer(id), new 
Long(entryState.getVersionID()),
  -                                              new 
Integer(entryState.getWorkflowState()), entryState.getLanguageCode())));
  +        JahiaFieldsData jahiaFieldsDataByPK = dao.findJahiaFieldsDataByPK(
  +                                new JahiaFieldsDataPK(new Integer(id), new 
Long(entryState.getVersionID()),
  +                                                      new 
Integer(entryState.getWorkflowState()), entryState.getLanguageCode()));
  +        if(jahiaFieldsDataByPK!=null)
  +        dao.deleteJahiaField(jahiaFieldsDataByPK);
           flushCache(id);
       }