From cbab0dbeb26f759e35356d82811590c5793cfeb4 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Mon, 25 Mar 2019 17:01:25 +0300
Subject: [PATCH] TenantInfo's setters should be public.

---
 .../Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs          | 1 -
 .../MultiTenancy/ConfigurationStore/DefaultTenantStore.cs   | 4 ++--
 .../Volo/Abp/MultiTenancy/TenantInfo.cs                     | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
index 6d31ccda86..a9b4c7b488 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
@@ -15,7 +15,6 @@ namespace Volo.Abp.MultiTenancy
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
-
             Configure<DefaultTenantStoreOptions>(configuration);
         }
     }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
index f96fe02ed7..c72955bb65 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
@@ -18,12 +18,12 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore
 
         public Task<TenantInfo> FindAsync(string name)
         {
-            return Task.FromResult(_options.Tenants.FirstOrDefault(t => t.Name == name));
+            return Task.FromResult(_options.Tenants?.FirstOrDefault(t => t.Name == name));
         }
 
         public Task<TenantInfo> FindAsync(Guid id)
         {
-            return Task.FromResult(_options.Tenants.FirstOrDefault(t => t.Id == id));
+            return Task.FromResult(_options.Tenants?.FirstOrDefault(t => t.Id == id));
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantInfo.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantInfo.cs
index e91c42a1fd..1c95cd7837 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantInfo.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantInfo.cs
@@ -7,13 +7,13 @@ namespace Volo.Abp.MultiTenancy
     [Serializable]
     public class TenantInfo //TODO: Add a custom data to TenantInfo and make it available in ICurrentTenant
     {
-        public Guid Id { get; }
+        public Guid Id { get; set; }
 
-        public string Name { get; }
+        public string Name { get; set; }
 
         public ConnectionStrings ConnectionStrings { get; }
 
-        private TenantInfo()
+        public TenantInfo()
         {
             
         }