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 mi...@apache.org on 2023/02/06 20:33:16 UTC

[jackrabbit-oak] branch trunk updated: OAK-10049 - Move config before call to getAzureContainer().

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 6e4c00e6e9 OAK-10049 - Move config before call to getAzureContainer().
     new 7d85c005b8 Merge pull request #846 from ahanikel/issues/OAK-10049-2
6e4c00e6e9 is described below

commit 6e4c00e6e908e8be379b984b46c53dd8cdc97319
Author: Axel Hanikel <ah...@adobe.com>
AuthorDate: Mon Feb 6 15:59:21 2023 +0100

    OAK-10049 - Move config before call to getAzureContainer().
---
 .../blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
index 3885cb333c..a4e88c3693 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
@@ -197,6 +197,11 @@ public class AzureBlobStoreBackend extends AbstractSharedBackend {
                 presignedDownloadURIVerifyExists = PropertiesUtil.toBoolean(
                     Strings.emptyToNull(properties.getProperty(AzureConstants.PRESIGNED_HTTP_DOWNLOAD_URI_VERIFY_EXISTS)), true);
 
+                enableSecondaryLocation = PropertiesUtil.toBoolean(
+                        properties.getProperty(AzureConstants.AZURE_BLOB_ENABLE_SECONDARY_LOCATION_NAME),
+                        AzureConstants.AZURE_BLOB_ENABLE_SECONDARY_LOCATION_DEFAULT
+                );
+
                 CloudBlobContainer azureContainer = getAzureContainer();
 
                 if (createBlobContainer && azureContainer.createIfNotExists()) {
@@ -233,11 +238,6 @@ public class AzureBlobStoreBackend extends AbstractSharedBackend {
                 if (createRefSecretOnInit) {
                     getOrCreateReferenceKey();
                 }
-
-                enableSecondaryLocation = PropertiesUtil.toBoolean(
-                        properties.getProperty(AzureConstants.AZURE_BLOB_ENABLE_SECONDARY_LOCATION_NAME),
-                        AzureConstants.AZURE_BLOB_ENABLE_SECONDARY_LOCATION_DEFAULT
-                );
             }
             catch (StorageException e) {
                 throw new DataStoreException(e);