Author: tdraier
Date: Wed Jun 6 13:11:18 2007
New Revision: 17468
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17468&repname=
=3Djahia
Log:
check lock owner before unlocking (DOC-89)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/file=
manager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.j=
ava&rev=3D17468&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/engines/filemanage=
r/DAVFilemanager_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java Wed Jun 6 13:11:18 2007
@@ -191,7 +191,9 @@
for (int i =3D 0; i < objectDaves.length; i++) {
final DAVFileAccess objectDav =3D objectDaves[i];
objectDav.beginTransaction();
- if (objectDav.isLocked()) {
+ if (objectDav.isLocked() && (
+ objectDav.getLock().getOwnerInfo().equals(jPar=
ams.getUser().getUsername()) ||
+ jParams.getUser().isAdminMember(jParam=
s.getSiteID()))) {
ok =3D objectDav.unlockFile(jParams.getUser().isRo=
ot());
} else {
ok =3D objectDav.lockFile(jParams.getUser().isRoot=
());
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
