cmailleux 2005/12/27 12:23:13 CET
Modified files:
core/src/java/org/jahia/hibernate/manager
JahiaContainerListManager.java
JahiaContainerManager.java
JahiaFieldsDataManager.java
JahiaPagesManager.java
Log:
Remove flush of workflow linked objects cache
Revision Changes Path
1.18 +1 -8
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java.diff?r1=1.17&r2=1.18&f=h
1.22 +1 -7
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.21&r2=1.22&f=h
1.25 +1 -7
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.24&r2=1.25&f=h
1.18 +0 -6
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.17&r2=1.18&f=h
Index: JahiaContainerListManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JahiaContainerListManager.java 21 Dec 2005 16:41:08 -0000 1.17
+++ JahiaContainerListManager.java 27 Dec 2005 11:23:12 -0000 1.18
@@ -632,13 +632,7 @@
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
else {
cache.flush(true);
- }
- cache =
cacheService.getCache(WorkflowService.WORKFLOWLINKEDOBJECTS_CACHENAME);
- if (cache != null && siteID > 0)
- cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
- else {
- cache.flush(true);
- }
+ }
cache =
cacheService.getCache(WorkflowService.WORKFLOWHARDLINKEDOBJECTS_CACHENAME);
if (cache != null && siteID > 0)
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
@@ -693,4 +687,3 @@
return idByPageIdAndDefinitionName.intValue();
}
}
-
Index: JahiaContainerManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JahiaContainerManager.java 6 Dec 2005 10:57:07 -0000 1.21
+++ JahiaContainerManager.java 27 Dec 2005 11:23:12 -0000 1.22
@@ -642,13 +642,7 @@
else {
cache.flush(true);
}
- }
- cache =
cacheService.getCache(WorkflowService.WORKFLOWLINKEDOBJECTS_CACHENAME);
- if (cache != null && siteID >= 0)
- cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
- else {
- cache.flush(true);
- }
+ }
cache =
cacheService.getCache(WorkflowService.WORKFLOWHARDLINKEDOBJECTS_CACHENAME);
if (cache != null && siteID > 0)
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
Index: JahiaFieldsDataManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JahiaFieldsDataManager.java 7 Dec 2005 15:42:22 -0000 1.24
+++ JahiaFieldsDataManager.java 27 Dec 2005 11:23:12 -0000 1.25
@@ -118,13 +118,7 @@
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX+siteID);
else if(cache != null){
cache.flush(true);
- }
- cache =
cacheService.getCache(WorkflowService.WORKFLOWLINKEDOBJECTS_CACHENAME);
- if (cache != null && siteID >= 0)
- cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
- else {
- cache.flush(true);
- }
+ }
cache =
cacheService.getCache(WorkflowService.WORKFLOWHARDLINKEDOBJECTS_CACHENAME);
if (cache != null && siteID > 0)
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
Index: JahiaPagesManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JahiaPagesManager.java 8 Dec 2005 10:56:46 -0000 1.17
+++ JahiaPagesManager.java 27 Dec 2005 11:23:12 -0000 1.18
@@ -121,12 +121,6 @@
Cache cache =
cacheService.getCache(WorkflowService.WORKFLOWLANGUAGESSTATES_CACHENAME);
if (cache != null)
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
- cache =
cacheService.getCache(WorkflowService.WORKFLOWLINKEDOBJECTS_CACHENAME);
- if (cache != null && siteID > 0)
- cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
- else {
- cache.flush(true);
- }
cache =
cacheService.getCache(WorkflowService.WORKFLOWHARDLINKEDOBJECTS_CACHENAME);
if (cache != null && siteID > 0)
cache.flushGroup(WorkflowService.WORKFLOWSERVICESITE_KEYPREFIX +
siteID);
