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 da...@apache.org on 2026/01/30 10:35:14 UTC
(jackrabbit-oak) branch OAK-12083 created (now c6e85b1fb1)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-12083
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at c6e85b1fb1 OAK-12083 : replaced guava's Uninterruptible.joinUninterruptibly with oak-commons
This branch includes the following new commits:
new c6e85b1fb1 OAK-12083 : replaced guava's Uninterruptible.joinUninterruptibly with oak-commons
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-12083 : replaced guava's Uninterruptible.joinUninterruptibly with oak-commons
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-12083
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c6e85b1fb1bafcb540ed31df1322e035f0d83f40
Author: rishabhdaim <ri...@gmail.com>
AuthorDate: Fri Jan 30 16:04:56 2026 +0530
OAK-12083 : replaced guava's Uninterruptible.joinUninterruptibly with oak-commons
---
.../jackrabbit/oak/plugins/document/HierarchyConflictTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
index 2f0dce4aff..a19c58b767 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.util.concurrent.Uninterruptibles.joinUninterruptibly;
import static org.apache.jackrabbit.oak.api.CommitFailedException.OAK;
import static org.junit.Assert.fail;
@@ -109,7 +108,7 @@ public class HierarchyConflictTest {
builder.getChildNode("foo").getChildNode("bar").child("qux");
nodeAdded.countDown();
// wait until r2 commits
- joinUninterruptibly(t);
+ UninterruptibleUtils.joinUninterruptibly(t);
}
});
@@ -167,7 +166,7 @@ public class HierarchyConflictTest {
builder.getChildNode("foo").getChildNode("bar").remove();
nodeRemoved.countDown();
// wait until r1 commits
- joinUninterruptibly(t);
+ UninterruptibleUtils.joinUninterruptibly(t);
}
});