Author: bpapez
Date: Wed Nov 7 15:14:35 2007
New Revision: 19065
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19065&repname=
=3Djahia
Log:
JAHIA-2588 - 30000 pages: it takes about 40s to display an action menu
* There was an illogical iteration in LockPrerequisites.verifyLockForAllChi=
ldren, which caused that the child-fields of all pages in the menu were loa=
ded in the check, whether the containerlist-update icon can be displayed or=
not
Modified:
trunk/core/src/java/org/jahia/services/lock/LockPrerequisites.java
Modified: trunk/core/src/java/org/jahia/services/lock/LockPrerequisites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/lock/LockPrerequisites.java&rev=3D19065&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/lock/LockPrerequisites.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/services/lock/LockPrerequisites.java Wed =
Nov 7 15:14:35 2007
@@ -395,7 +395,7 @@
for (Iterator iterator =3D c.iterator(); iterator.hasNext();) {
ContentObjectKey child =3D (ContentObjectKey) iterator.nex=
t();
verifyLockForEditObject(child, owner, context, justTesting=
, results);
- if (recurse || !(object instanceof ContentPageKey)) {
+ if (!(child instanceof ContentPageKey)) {
verifyLockForAllChildren(child, owner, context, justTe=
sting, results, recurse);
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
