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

[Cedric Mailleux]

cmailleux    2005/09/27 17:26:10 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/manager 
                                              JahiaContainerManager.java 
  Log:
  Return clone because there is problem of flushing for sub container
  
  Revision  Changes    Path
  1.14      +4 -2      
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.13&r2=1.14&f=h
  
  
  
  Index: JahiaContainerManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JahiaContainerManager.java        27 Sep 2005 13:14:08 -0000      1.13
  +++ JahiaContainerManager.java        27 Sep 2005 15:26:10 -0000      1.14
  @@ -393,7 +393,7 @@
           Cache cache = getJahiaContainerCache();
           if (cache != null) {
               jahiaContainer = (JahiaContainer) 
cache.get(CacheAdvice.toGroupCacheKey(new Object[]{CACHE_KEY_PREFIX + 
containerId, request}));
  -            if (jahiaContainer != null) return jahiaContainer;
  +            if (jahiaContainer != null) return (JahiaContainer) 
jahiaContainer.clone();
           }
           try {
               if (request != null) {
  @@ -415,7 +415,9 @@
           if (cache != null) {
               cache.put(CacheAdvice.toGroupCacheKey(new 
Object[]{CACHE_KEY_PREFIX + containerId, request}), jahiaContainer);
           }
  -        return jahiaContainer;
  +        if(jahiaContainer!=null)
  +        return (JahiaContainer) jahiaContainer.clone();
  +        else return null;
       }
   
       private Cache getJahiaContainerCache() {