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

[Benjamin Papez]

bpapez      2005/12/06 13:11:16 CET

  Modified files:
    core/src/java/org/jahia/hibernate/manager 
                                              JahiaFieldsDataManager.java 
  Log:
  add load content field to retrieve fields from database and not from cache
  
  Revision  Changes    Path
  1.23      +10 -3     
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.22&r2=1.23&f=h
  
  
  
  Index: JahiaFieldsDataManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JahiaFieldsDataManager.java       6 Dec 2005 10:57:07 -0000       1.22
  +++ JahiaFieldsDataManager.java       6 Dec 2005 12:11:16 -0000       1.23
  @@ -514,13 +514,20 @@
       }
   
       public ContentField loadContentField(int fieldID) {
  +        return loadContentField(fieldID, false);
  +    }
  +    
  +    public ContentField loadContentField(int fieldID, boolean 
forceLoadFromDB) {
           try {
               if(fieldCache == null) {
                   fieldCache = cacheService.createCacheInstance(CACHE_NAME);
               }
  -            ContentField retContentField = (ContentField) 
fieldCache.get(CACHE_KEY_PREFIX+fieldID);
  -            if(retContentField != null) {
  -                return retContentField;
  +            if (!forceLoadFromDB) {
  +                ContentField retContentField = (ContentField) fieldCache
  +                        .get(CACHE_KEY_PREFIX + fieldID);
  +                if (retContentField != null) {
  +                    return retContentField;
  +                }
               }
               List list = dao.loadAllActiveOrStagedFieldEntry(new 
Integer(fieldID));
               List activeEntryStates = new FastArrayList(53);