Merge pull request #5759 from abpframework/maliming-patch-1

Avoid decrypt null setting value.
abpframework · Oct 11, 2020 · 16b21f9 · 16b21f9
2 parents 59fd31b + bae1ddb
commit 16b21f9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs
@@ -35,7 +35,7 @@ public virtual async Task<string> GetOrNullAsync(string name)
             //TODO: How to implement setting.IsInherited?
 
             var value = await GetOrNullValueFromProvidersAsync(providers, setting);
-            if (setting.IsEncrypted)
+            if (value != null && setting.IsEncrypted)
             {
                 value = SettingEncryptionService.Decrypt(setting, value);
             }
@@ -84,4 +84,4 @@ protected virtual async Task<string> GetOrNullValueFromProvidersAsync(
             return null;
         }
     }
-}
+}