svn commit: [jahia] r17758 - /trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java

[tdraier]

Author: tdraier
Date: Mon Jun 25 15:31:10 2007
New Revision: 17758

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17758&repname=
=3Djahia
Log:
get only unlinked child when needed (JAHIA-2046) ( backport 17564 )

Modified:
    trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java

Modified: trunk/core/src/java/org/jahia/services/workflow/WorkflowService.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/workflow/WorkflowService.java&rev=3D17758&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
--- trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java Mo=
n Jun 25 15:31:10 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
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list