From 8003e1d43936b58463ae28b060b3a67be8e020cb Mon Sep 17 00:00:00 2001
From: Engincan VESKE <enginveske@gmail.com>
Date: Wed, 10 Jun 2026 16:19:52 +0300
Subject: [PATCH] Use fallback blob provider type.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Volo/Abp/BlobStoring/BlobContainerConfiguration.cs    | 8 +++++++-
 .../Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs   | 1 +
 .../Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs      | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
index fe0a0e09f9..4cc59ff3d0 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
@@ -7,10 +7,16 @@ namespace Volo.Abp.BlobStoring;
 
 public class BlobContainerConfiguration
 {
+    private Type? _providerType;
+
     /// <summary>
     /// The provider to be used to store BLOBs of this container.
     /// </summary>
-    public Type? ProviderType { get; set; }
+    public Type? ProviderType
+    {
+        get => _providerType ?? _fallbackConfiguration?.ProviderType;
+        set => _providerType = value;
+    }
 
     /// <summary>
     /// Indicates whether this container is multi-tenant or not.
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs
index 0035cfbe36..5659e9c3c6 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs
@@ -33,6 +33,7 @@ public class AbpBlobStoringOptions_Tests : AbpBlobStoringTestBase
     {
         var config = _configurationProvider.Get<TestContainer3>();
         config.ProviderType.ShouldBe(typeof(FakeBlobProvider1));
+        config.IsMultiTenant.ShouldBeFalse();
         config.GetConfigurationOrNull("TestConfigDefault").ShouldBe("TestValueDefault");
     }
 }
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs
index a6746a9480..93523a8c88 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs
@@ -36,6 +36,10 @@ public class AbpBlobStoringTestModule : AbpModule
                 {
                     container.SetConfiguration("TestConfig2", "TestValue2");
                     container.ProviderType = typeof(FakeBlobProvider2);
+                })
+                .Configure<TestContainer3>(container =>
+                {
+                    container.IsMultiTenant = false;
                 });
         });
     }