Author: tdraier
Date: Thu Jun 14 17:41:33 2007
New Revision: 17564
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17564&repname=
=3Djahia
Log:
get only unlinked child when needed ( JAHIA-2046 )
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowService.java&rev=
=3D17564&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java Thu Jun 14 17:41:33 2007
@@ -792,7 +792,7 @@
=
Set keys =3D new HashSet();
l =3D new List[] { new ArrayList(), new ArrayList() };
- getLinkedContentObjects(object, keys, l[0], l[1], descendI=
nAllSubGroups, true);
+ getLinkedContentObjects(object, keys, l[0], l[1], descendI=
nAllSubGroups, checkParents);
l[1].removeAll(l[0]);
cacheKey.getGroups().add(object.toString());
cacheKey.getGroups().add(MAINPREFIX + main.toString());
@@ -867,8 +867,7 @@
for (Iterator iterator =3D childs.iterator(); iterator.hasNext();)=
{
ContentObjectKey child =3D (ContentObjectKey) iterator.next();
if (getMainLinkObject(child).equals(k)) {
- linked.add(child);
- getLinkedContentObjects(child, keys, linked, unlinked, des=
cendInAllSubGroups, checkParents);
+ getLinkedContentObjects(child, keys, linked, unlinked, des=
cendInAllSubGroups, false);
} else {
unlinked.add(child);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
