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 2025/01/20 02:48:19 UTC

(jackrabbit-oak) branch 1.22 updated: Merge pull request #1905 from t-rana/issues/OAK-11310 (#2001)

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

daim pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/1.22 by this push:
     new 885b438a67 Merge pull request #1905 from t-rana/issues/OAK-11310 (#2001)
885b438a67 is described below

commit 885b438a6740c701daa6c8cfb57df72927560a4a
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Mon Jan 20 08:18:14 2025 +0530

    Merge pull request #1905 from t-rana/issues/OAK-11310 (#2001)
    
    OAK-11310 : add properties before datastore is initialised
---
 .../apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java   | 2 +-
 .../test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java   | 4 ++--
 .../org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java
index 5c903fc818..f571c05925 100644
--- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java
+++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java
@@ -38,7 +38,7 @@ public class TestS3DSWithSmallCache extends TestS3Ds {
     @Override
     @Before
     public void setUp() throws Exception {
-        super.setUp();
         props.setProperty("cacheSize", String.valueOf(dataLength * 10));
+        super.setUp();
     }
 }
diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
index 166c2d44c4..ba86731620 100644
--- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
+++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
@@ -100,7 +100,7 @@ public class TestS3Ds extends AbstractDataStoreTest {
     private static Date overallStartTime = getBackdatedDate();
     private Date thisTestStartTime = null;
 
-    protected Properties props;
+    protected Properties props = new Properties();
 
     protected String bucket;
 
@@ -127,7 +127,7 @@ public class TestS3Ds extends AbstractDataStoreTest {
     @Override
     @Before
     public void setUp() throws Exception {
-        props = getS3Config();
+        props.putAll(getS3Config());
         thisTestStartTime = getBackdatedDate();
         bucket = randomGen.nextInt(9999) + "-" +
                 randomGen.nextInt(9999) + "-s3ds-unittest-autogenerated";
diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java
index 7254001943..a7fe1bd9d1 100644
--- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java
+++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java
@@ -36,7 +36,7 @@ public class TestS3DsCacheOff extends TestS3Ds {
     @Override
     @Before
     public void setUp() throws Exception {
-        super.setUp();
         props.setProperty("cacheSize", "0");
+        super.setUp();
     }
 }