cmailleux 2005/12/13 11:19:46 CET
Modified files:
core/src/java/org/jahia/engines/workflow
AdvancedWorkflowEngine.java
Log:
correctly release cache
Revision Changes Path
1.31 +7 -11
jahia/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.java.diff?r1=1.30&r2=1.31&f=h
Index: AdvancedWorkflowEngine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AdvancedWorkflowEngine.java 13 Dec 2005 09:54:10 -0000 1.30
+++ AdvancedWorkflowEngine.java 13 Dec 2005 10:19:46 -0000 1.31
@@ -919,22 +919,18 @@
// here below we set the page level to maximum because we want
// to free all the sub pages locks.
WorkflowSiteMapViewHelper treeSiteMapViewHelper =
(WorkflowSiteMapViewHelper) siteMapService.
- getWorkflowSiteMapViewHelper (user, contentPage,
- jParams.getSessionID (),
ContentPage.ACTIVE_PAGE_INFOS |
- ContentPage.STAGING_PAGE_INFOS,
- null, Integer.MAX_VALUE);
+ getWorkflowSiteMapViewHelper(user, contentPage,
jParams.getSessionID(),
+
ContentPage.ACTIVE_PAGE_INFOS | ContentPage.STAGING_PAGE_INFOS,
+ null,
SiteMapViewHelper.DEFAULT_LEVEL);
// Lock all page site if possible.
LockService lockRegistry = ServicesRegistry.getInstance
().getLockService ();
for (int i = 0; i < treeSiteMapViewHelper.size (); i++) {
ContentObject siteMapContentPage =
treeSiteMapViewHelper.getContentObject(i);
- // can put WORKFLOW_TYPE locks only on pages
- if (siteMapContentPage instanceof ContentPage) {
- if (siteMapContentPage != null) {
- LockKey lockKey = getLockKey(siteMapContentPage);
- lockRegistry.release (lockKey, user,
user.getUserKey());
-
htmlCache.invalidatePageEntries(Integer.toString(siteMapContentPage.getID()));
- }
+ if (siteMapContentPage != null) {
+ LockKey lockKey = getLockKey(siteMapContentPage);
+ lockRegistry.release(lockKey, user, user.getUserKey());
+
htmlCache.invalidatePageEntries(Integer.toString(siteMapContentPage.getID()));
}
}
}
