(jackrabbit-oak) branch issue/OAK-10006 updated: OAK-10006 modified constructor

[miroslav]

This is an automated email from the ASF dual-hosted git repository.

miroslav pushed a commit to branch issue/OAK-10006
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/issue/OAK-10006 by this push:
     new e098e5b097 OAK-10006 modified constructor
e098e5b097 is described below

commit e098e5b09781383d2d1d686953ad56791e97339e
Author: smiroslav <miros...@apache.org>
AuthorDate: Fri Nov 10 17:30:14 2023 +0100

    OAK-10006 modified constructor
---
 .../jackrabbit/oak/segment/azure/AzureRepositoryLock.java    |  4 ++--
 .../oak/segment/azure/AzureArchiveManagerTest.java           |  2 +-
 .../oak/segment/azure/AzureRepositoryLockTest.java           | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLock.java
 
b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLock.java
index 6de3756d81..d4318769f9 100644
--- 
a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLock.java
+++ 
b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLock.java
@@ -53,10 +53,10 @@ public class AzureRepositoryLock implements RepositoryLock {
     private volatile boolean doUpdate;
 
     public AzureRepositoryLock(CloudBlockBlob blob, Runnable shutdownHook, 
WriteAccessController writeAccessController) {
-        this(blob, shutdownHook, TIMEOUT_SEC, writeAccessController);
+        this(blob, shutdownHook, writeAccessController, TIMEOUT_SEC);
     }
 
-    public AzureRepositoryLock(CloudBlockBlob blob, Runnable shutdownHook, int 
timeoutSec, WriteAccessController writeAccessController) {
+    public AzureRepositoryLock(CloudBlockBlob blob, Runnable shutdownHook, 
WriteAccessController writeAccessController, int timeoutSec) {
         this.shutdownHook = shutdownHook;
         this.blob = blob;
         this.executor = Executors.newSingleThreadExecutor();
diff --git 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java
 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java
index ab7f2f5231..148773728b 100644
--- 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java
+++ 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java
@@ -486,7 +486,7 @@ public class AzureArchiveManagerTest {
 
         AzurePersistence mockedRwPersistence = Mockito.spy(rwPersistence);
         WriteAccessController writeAccessController = new 
WriteAccessController();
-        AzureRepositoryLock azureRepositoryLock = new 
AzureRepositoryLock(blobMocked, () -> {}, 0, writeAccessController);
+        AzureRepositoryLock azureRepositoryLock = new 
AzureRepositoryLock(blobMocked, () -> {}, writeAccessController);
         AzureArchiveManager azureArchiveManager = new 
AzureArchiveManager(oakDirectory, new IOMonitorAdapter(), new 
FileStoreMonitorAdapter(), writeAccessController);
 
 
diff --git 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLockTest.java
 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLockTest.java
index 03119ab839..ce62eda306 100644
--- 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLockTest.java
+++ 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureRepositoryLockTest.java
@@ -58,9 +58,9 @@ public class AzureRepositoryLockTest {
     @Test
     public void testFailingLock() throws URISyntaxException, IOException, 
StorageException {
         CloudBlockBlob blob = container.getBlockBlobReference("oak/repo.lock");
-        new AzureRepositoryLock(blob, () -> {}, 0, new 
WriteAccessController()).lock();
+        new AzureRepositoryLock(blob, () -> {}, new 
WriteAccessController()).lock();
         try {
-            new AzureRepositoryLock(blob, () -> {}, 0, new 
WriteAccessController()).lock();
+            new AzureRepositoryLock(blob, () -> {}, new 
WriteAccessController()).lock();
             fail("The second lock should fail.");
         } catch (IOException e) {
             // it's fine
@@ -73,7 +73,7 @@ public class AzureRepositoryLockTest {
         Semaphore s = new Semaphore(0);
         new Thread(() -> {
             try {
-                RepositoryLock lock = new AzureRepositoryLock(blob, () -> {}, 
0, new WriteAccessController()).lock();
+                RepositoryLock lock = new AzureRepositoryLock(blob, () -> {}, 
new WriteAccessController()).lock();
                 s.release();
                 Thread.sleep(1000);
                 lock.unlock();
@@ -83,7 +83,7 @@ public class AzureRepositoryLockTest {
         }).start();
 
         s.acquire();
-        new AzureRepositoryLock(blob, () -> {}, 10, new 
WriteAccessController()).lock();
+        new AzureRepositoryLock(blob, () -> {}, new WriteAccessController(), 
10).lock();
     }
 
     @Test
@@ -100,7 +100,7 @@ public class AzureRepositoryLockTest {
                 .doCallRealMethod()
                 .when(blobMocked).renewLease(Mockito.any());
 
-        new AzureRepositoryLock(blobMocked, () -> {}, 0, new 
WriteAccessController()).lock();
+        new AzureRepositoryLock(blobMocked, () -> {}, new 
WriteAccessController()).lock();
 
         // wait till lease expires
         Thread.sleep(70000);
@@ -109,7 +109,7 @@ public class AzureRepositoryLockTest {
         Mockito.doCallRealMethod().when(blobMocked).renewLease(Mockito.any());
 
         try {
-            new AzureRepositoryLock(blobMocked, () -> {}, 0, new 
WriteAccessController()).lock();
+            new AzureRepositoryLock(blobMocked, () -> {}, new 
WriteAccessController()).lock();
             fail("The second lock should fail.");
         } catch (IOException e) {
             // it's fine