cmailleux 2005/12/27 11:38:57 CET
Modified files:
core/src/java/org/jahia/services/workflow WorkflowService.java
Log:
Remove linked objects cache (suffer of lack of efficiency and have wrong
behavior)
Resolve JIRA-601
Revision Changes Path
1.40 +4 -13
jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java.diff?r1=1.39&r2=1.40&f=h
Index: WorkflowService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- WorkflowService.java 21 Dec 2005 14:13:42 -0000 1.39
+++ WorkflowService.java 27 Dec 2005 10:38:57 -0000 1.40
@@ -72,7 +72,6 @@
private CacheService cacheService = null;
private Cache cache;
private Cache modeCache;
- private Cache linkedObjectsCache;
private Cache hardLinkedObjectsCache;
public void setWorkflowManager(JahiaWorkflowManager workflowManager) {
@@ -105,7 +104,6 @@
throws JahiaInitializationException {
cache =
cacheService.createCacheInstance(WORKFLOWLANGUAGESSTATES_CACHENAME);
modeCache = cacheService.createCacheInstance(WORKFLOWMODE_CACHENAME);
- linkedObjectsCache =
cacheService.createCacheInstance(WORKFLOWLINKEDOBJECTS_CACHENAME);
hardLinkedObjectsCache =
cacheService.createCacheInstance(WORKFLOWHARDLINKEDOBJECTS_CACHENAME);
try {
loadConfiguration (settingsBean.getJahiaEtcDiskPath () +
WorkflowService.CONFIG_PATH +
@@ -521,17 +519,10 @@
public List getLinkedContentObjects(ContentObject object, boolean
descendInAllSubGroups) throws JahiaException{
List linked = null;
- final GroupCacheKey entryKey = CacheAdvice.toGroupCacheKey(new
Object[]{WORKFLOWLINKEDOBJECT_KEYPREFIX +
-
object.getObjectKey().toString(),
- WORKFLOWSERVICESITE_KEYPREFIX +
object.getSiteID(),Boolean.valueOf(descendInAllSubGroups)});
- linked = (List) linkedObjectsCache.get(entryKey);
- if(linked == null) {
- Set keys = new HashSet();
- linked = new ArrayList();
- List unlinked = new ArrayList();
- getLinkedContentObjects(object, keys, linked, unlinked,
descendInAllSubGroups);
- linkedObjectsCache.put(entryKey,linked);
- }
+ Set keys = new HashSet();
+ linked = new ArrayList();
+ List unlinked = new ArrayList();
+ getLinkedContentObjects(object, keys, linked, unlinked,
descendInAllSubGroups);
return linked;
}
