Author: knguyen
Date: Mon Aug 20 15:08:53 2007
New Revision: 18209
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18209&repname=
=3Djahia
Log:
fix JAHIA-1462: fix ACL infinite loop when restoring ContentPage.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java&rev=3D18209=
&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/pages/Con=
tentPage.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java Mon Aug 20 15:08:53 2007
@@ -4697,7 +4697,9 @@
languageCodes, false, entryState,stateModi=
ficationContext.isUndelete())));
=
// change page parent Acl accordingly to the new parent fi=
eld acl
- this.getACL().setParentID(versionedParentField.getAclID());
+ if (this.getACL().getID() !=3D versionedParentField.getAcl=
ID()){
+ this.getACL().setParentID(versionedParentField.getAclI=
D());
+ }
=
ContentObject versionedParentContainer =3D versionedParent=
Field.
getParent(user, versionedLoadRequest, operationMod=
e);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
