Author: sshyrkov
Date: Fri Nov 9 10:48:28 2007
New Revision: 19095
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19095&repname=
=3Djahia
Log:
[trunk r19065] JAHIA-2588 - 30000 pages: it takes about 40s to display an a=
ction 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:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/lock=
/LockPrerequisites.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/lock/LockPrerequisites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/lock/LockPrerequisites.java&r=
ev=3D19095&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/lock=
/LockPrerequisites.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/lock=
/LockPrerequisites.java Fri Nov 9 10:48:28 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
