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

Author: adamretter

src/org/exist/security/PermissionFactory.java

@@ -39,7 +39,6 @@
 import org.exist.storage.lock.Lock.LockMode;
 import org.exist.storage.txn.Txn;
 import com.evolvedbinary.j8fu.function.ConsumerE;
-import org.exist.util.LockException;
 import org.exist.util.SyntaxException;
 import org.exist.xmldb.XmldbURI;
 import org.exist.xquery.XPathException;
@@ -134,8 +133,8 @@ private static void updatePermissions(final DBBroker broker, final Txn transacti
 
                         final DocumentImpl doc = lockedDoc.getDocument();
 
-                        // keep a write lock in the transaction
-                        transaction.acquireDocumentLock(() -> brokerPool.getLockManager().acquireDocumentWriteLock(doc.getURI()));
+//                        // keep a write lock in the transaction
+//                        transaction.acquireDocumentLock(() -> brokerPool.getLockManager().acquireDocumentWriteLock(doc.getURI()));
 
 
                         final Permission permissions = doc.getPermissions();
@@ -144,8 +143,8 @@ private static void updatePermissions(final DBBroker broker, final Txn transacti
                         broker.storeXMLResource(transaction, doc);
                     }
                 } else {
-                    // keep a write lock in the transaction
-                    transaction.acquireCollectionLock(() -> brokerPool.getLockManager().acquireCollectionWriteLock(collection.getURI()));
+//                    // keep a write lock in the transaction
+//                    transaction.acquireCollectionLock(() -> brokerPool.getLockManager().acquireCollectionWriteLock(collection.getURI()));
 
                     final Permission permissions = collection.getPermissionsNoLock();
                     permissionModifier.accept(permissions);
@@ -154,7 +153,7 @@ private static void updatePermissions(final DBBroker broker, final Txn transacti
                 }
                 broker.flush();
             }
-        } catch(final XPathException | PermissionDeniedException | IOException | LockException e) {
+        } catch(final XPathException | PermissionDeniedException | IOException e) {
             throw new PermissionDeniedException("Permission to modify permissions is denied for user '" + broker.getCurrentSubject().getName() + "' on '" + pathUri.toString() + "': " + e.getMessage(), e);
         }
     }

src/org/exist/storage/txn/Txn.java

@@ -81,15 +81,6 @@ public long getId() {
         return id;
     }
 
-    /**
-     * @deprecated Moving a Lock to a Txn is error prone and should not be done
-     *   instead use {@link #acquireLock(Lock, LockMode)} to take a second lock
-     */
-    @Deprecated
-    public void registerLock(final Lock lock, final LockMode lockMode) {
-        locksHeld.add(new LockInfo(new Tuple2<>(lock, lockMode), () -> lock.release(lockMode)));
-    }
-
     public void acquireLock(final Lock lock, final LockMode lockMode) throws LockException {
         lock.acquire(lockMode);
         locksHeld.add(new LockInfo(new Tuple2<>(lock, lockMode), () -> lock.release(lockMode)));