knguyen 2005/11/04 15:25:46 CET
Modified files:
core/src/java/org/jahia/hibernate/manager
JahiaPagesManager.java
Log:
- oups, seems to lead to infinite loop when validating pages. Temporarily
Rollback change
Revision Changes Path
1.14 +1 -10
jahia/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java.diff?r1=1.13&r2=1.14&f=h
Index: JahiaPagesManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JahiaPagesManager.java 3 Nov 2005 18:26:56 -0000 1.13
+++ JahiaPagesManager.java 4 Nov 2005 14:25:45 -0000 1.14
@@ -141,10 +141,6 @@
cache.remove(ContentPageKey.PAGE_TYPE);
}
}
- cache =
cacheService.getCache(JahiaContainerListManager.JAHIA_CONTAINER_LIST_ID_CACHE);
- if(cache!=null) {
-
cache.flushGroup(JahiaContainerListManager.PAGE_ID_CACHE_PREFIX+pageId);
- }
}
public JahiaPageInfo copyEntry(int id, EntryStateable fromEntryState,
EntryStateable toEntryState) {
@@ -221,8 +217,6 @@
if(dao.getNBPages(activeInfo.getID())==0){
try {
ContentPageXRefManager.getInstance().removeAllPageLinks(activeInfo.getID());
- // @Todo find a better way of flushing when truly deleting
page
- cacheService.flushAllCaches();
} catch (JahiaException e) {
throw new RuntimeException(e);
}
@@ -449,10 +443,7 @@
data.setPageType(new Integer(newStagingInfo.getPageType()));
// Have we move the page ? if so flsuh all caches because we do not
know yet which cache must be flushed
// @Todo find a better way of flushing when moving page
- int parentID = 0;
- if(data.getParentID()!=null)
- parentID = data.getParentID().intValue();
- if(newStagingInfo.getParentID()!= parentID)
+ if(data.getParentID()!= null && newStagingInfo.getParentID()!=
data.getParentID().intValue())
cacheService.flushAllCaches();
data.setParentID(new Integer(newStagingInfo.getParentID()));
data.setRemoteURL(newStagingInfo.getRemoteURL());
