You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2021/01/11 08:36:51 UTC
svn commit: r1885356 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml
src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java
Author: mreutegg
Date: Mon Jan 11 08:36:51 2021
New Revision: 1885356
URL: http://svn.apache.org/viewvc?rev=1885356&view=rev
Log:
OAK-9187: LockOperation always calls SessionDelegate.refresh before executing operations
Apply patch provided by Angela and put testLockTransfer and testOpenScopedLocks on known issues list.
Modified:
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1885356&r1=1885355&r2=1885356&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Mon Jan 11 08:36:51 2021
@@ -53,13 +53,11 @@
<!-- Locking : not fully implemented -->
org.apache.jackrabbit.test.api.lock.LockTest#testNodeLocked <!-- OAK-3482 -->
org.apache.jackrabbit.test.api.lock.LockTest#testAddRemoveLockToken <!-- OAK-2149 -->
-
+ org.apache.jackrabbit.test.api.lock.LockTest#testLockTransfer <!-- OAK-9187 -->
+ org.apache.jackrabbit.test.api.lock.LockTest#testOpenScopedLocks <!-- OAK-9187 -->
org.apache.jackrabbit.test.api.lock.SetValueLockExceptionTest#testSetValueLockException <!-- OAK-2149 -->
-
org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveLockedChild <!-- OAK-2149 -->
-
org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken3 <!-- OAK-2149 -->
-
org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock
org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock2
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java?rev=1885356&r1=1885355&r2=1885356&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java Mon Jan 11 08:36:51 2021
@@ -42,16 +42,9 @@ public abstract class LockOperation<T> e
this.path = context.getOakPathOrThrowNotFound(absPath);
}
- @Override
- public boolean isRefresh() {
- return true;
- }
-
@NotNull
@Override
public T perform() throws RepositoryException {
- session.refresh(true);
-
NodeDelegate node = session.getNode(path);
if (node != null) {
return perform(node);
@@ -62,8 +55,6 @@ public abstract class LockOperation<T> e
@Override
public void performVoid() throws RepositoryException {
- session.refresh(true);
-
NodeDelegate node = session.getNode(path);
if (node != null) {
performVoid(node);