[bugfix] Locks do not need to be acquired for the transaction life-time for permission changes

Author: adamretter

src/org/exist/security/PermissionFactory.java

@@ -34,7 +34,6 @@
 import org.exist.storage.txn.TransactionManager;
 import org.exist.storage.txn.Txn;
 import com.evolvedbinary.j8fu.function.ConsumerE;
-import org.exist.util.LockException;
 import org.exist.xmldb.XmldbURI;
 import org.exist.xquery.XPathException;
 
@@ -125,8 +124,8 @@ public static void updatePermissions(final DBBroker broker, final XmldbURI pathU
                             throw new XPathException("Resource or collection '" + pathUri.toString() + "' does not exist.");
                         }
 
-                        // keep a write lock in the transaction
-                        transaction.acquireLock(doc.getUpdateLock(), LockMode.WRITE_LOCK);
+//                        // keep a write lock in the transaction
+//                        transaction.acquireLock(doc.getUpdateLock(), LockMode.WRITE_LOCK);
 
                         final Permission permissions = doc.getPermissions();
                         permissionModifier.accept(permissions);
@@ -140,8 +139,8 @@ public static void updatePermissions(final DBBroker broker, final XmldbURI pathU
                     transact.commit(transaction);
                     broker.flush();
                 } else {
-                    // keep a write lock in the transaction
-                    transaction.acquireLock(collection.getLock(), LockMode.WRITE_LOCK);
+//                    // keep a write lock in the transaction
+//                    transaction.acquireLock(collection.getLock(), LockMode.WRITE_LOCK);
 
                     final Permission permissions = collection.getPermissionsNoLock();
                     permissionModifier.accept(permissions);
@@ -155,7 +154,7 @@ public static void updatePermissions(final DBBroker broker, final XmldbURI pathU
                     collection.release(LockMode.WRITE_LOCK);
                 }
             }
-        } catch(final XPathException | PermissionDeniedException | IOException | TriggerException | TransactionException | LockException e) {
+        } catch(final XPathException | PermissionDeniedException | IOException | TriggerException | TransactionException e) {
             throw new PermissionDeniedException("Permission to modify permissions is denied for user '" + broker.getCurrentSubject().getName() + "' on '" + pathUri.toString() + "': " + e.getMessage(), e);
         }
     }