Avoid decrypt null setting value.

5 years ago · bae1ddbed1
parent 207df569b6
commit bae1ddbed1
1 changed files with 2 additions and 2 deletions
--- 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 @@ namespace Volo.Abp.Settings
            //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 @@ namespace Volo.Abp.Settings
            return null;
        }
    }
-}
+}