From 0a4522d1e7a312ff1823cdddb670f7c7ac8a3711 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Mon, 31 Dec 2018 16:08:51 +0300
Subject: [PATCH] Fixed setting management tests

---
 .../Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
index f2d808644d..ca7adb0655 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
@@ -121,7 +121,10 @@ namespace Volo.Abp.Settings
                     value = SettingEncryptionService.Decrypt(setting, value);
                 }
 
-                settingValues[setting.Name] = new SettingValue(setting.Name, value);
+                if (value != null)
+                {
+                    settingValues[setting.Name] = new SettingValue(setting.Name, value);
+                }
             }
 
             return settingValues.Values.ToList();