From ee842252606dcf6778c13432d59331fce5d1db89 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Wed, 26 Aug 2020 15:10:05 +0800
Subject: [PATCH] Fix unit test.

---
 .../Volo/Abp/FeatureManagement/FeatureAppService.cs       | 7 +++----
 .../Volo/Abp/FeatureManagement/FeatureManager.cs          | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
index 8fc761a632..c63336ded1 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
@@ -33,8 +33,7 @@ namespace Volo.Abp.FeatureManagement
 
             foreach (var featureDefinition in featureDefinitions)
             {
-                var value = await FeatureManager.GetOrNullWithProviderAsync(featureDefinition.Name, providerName,
-                    providerKey);
+                var feature = await FeatureManager.GetOrNullWithProviderAsync(featureDefinition.Name, providerName, providerKey);
                 features.Add(new FeatureDto
                 {
                     Name = featureDefinition.Name,
@@ -42,8 +41,8 @@ namespace Volo.Abp.FeatureManagement
                     ValueType = featureDefinition.ValueType,
                     Description = featureDefinition.Description?.Localize(StringLocalizerFactory),
                     ParentName = featureDefinition.Parent?.Name,
-                    Value = value.Value,
-                    ProviderName = value.Provider.Name
+                    Value = feature.Value,
+                    ProviderName = feature.Provider?.Name
                 });
             }
 
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs
index 5ff7c18407..c708743b93 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs
@@ -184,7 +184,7 @@ namespace Volo.Abp.FeatureManagement
                 providers = providers.SkipWhile(c => c.Name != providerName);
             }
 
-            FeatureNameValueWithGrantedProvider featureNameValueWithGrantedProvider = null;
+            var featureNameValueWithGrantedProvider = new FeatureNameValueWithGrantedProvider(name, null);
             foreach (var provider in providers)
             {
                 string pk = null;
@@ -196,10 +196,8 @@ namespace Volo.Abp.FeatureManagement
                 var value = await provider.GetOrNullAsync(feature, pk);
                 if (value != null)
                 {
-                    featureNameValueWithGrantedProvider = new FeatureNameValueWithGrantedProvider(name, value)
-                    {
-                        Provider = new FeatureValueProviderInfo(provider.Name, pk)
-                    };
+                    featureNameValueWithGrantedProvider.Value = value;
+                    featureNameValueWithGrantedProvider.Provider = new FeatureValueProviderInfo(provider.Name, pk);
                     break;
                 }
             }