Author: tdraier
Date: Thu Jul 12 11:14:44 2007
New Revision: 17943
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17943&repname=
=3Djahia
Log:
do not create acl if it's not modified (port 17926)
Modified:
trunk/core/src/java/org/jahia/engines/rights/ManageRights.java
Modified: trunk/core/src/java/org/jahia/engines/rights/ManageRights.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/rights/ManageRights.java&rev=3D17943&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/engines/rights/ManageRights.java (origina=
l)
+++ trunk/core/src/java/org/jahia/engines/rights/ManageRights.java Thu Jul =
12 11:14:44 2007
@@ -896,10 +896,9 @@
return true;
}
=
- int aclID =3D 0;
try {
- aclID =3D acl.getID();
if (newAcl) {
+ int aclID =3D acl.getID();
acl =3D new JahiaBaseACL();
acl.create(aclID);
engineMap.put(NEW_ACL+"_"+sessionIdentifier, acl);
@@ -1068,6 +1067,11 @@
JahiaEvent setRightsEvent =3D new JahiaEvent(this, processingC=
ontext, acl);
ServicesRegistry.getInstance ().getJahiaEventService ().fireSe=
tRights(setRightsEvent);
=
+ if (newAcl && !aclAltered) {
+ engineMap.remove(NEW_ACL+"_"+sessionIdentifier);
+ acl.delete();
+ }
+ =
return true;
} catch (Exception e) {
logger.error("Cannot save acl "+acl, e);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
