From f52472438e1334990d13a4c509fe901b7dc935b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 27 Jun 2020 13:29:09 +0300
Subject: [PATCH] #4471 Prevent duplicate adding the same normalizer to the
 same container.

Also made TryAdd returns bool (we don't need it but someone may need)
---
 .../Azure/AzureBlobContainerConfigurationExtensions.cs       | 2 +-
 .../FileSystemBlobContainerConfigurationExtensions.cs        | 2 +-
 .../src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs      | 2 +-
 framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs
index 4f1c587530..3b3cbc4743 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.Azure
             Action<AzureBlobProviderConfiguration> azureConfigureAction)
         {
             containerConfiguration.ProviderType = typeof(AzureBlobProvider);
-            containerConfiguration.NamingNormalizers.Add<AzureBlobNamingNormalizer>();
+            containerConfiguration.NamingNormalizers.TryAdd<AzureBlobNamingNormalizer>();
 
             azureConfigureAction(new AzureBlobProviderConfiguration(containerConfiguration));
 
diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs
index 659b5cd2bc..2bb818da56 100644
--- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs
+++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.FileSystem
             Action<FileSystemBlobProviderConfiguration> fileSystemConfigureAction)
         {
             containerConfiguration.ProviderType = typeof(FileSystemBlobProvider);
-            containerConfiguration.NamingNormalizers.Add<FileSystemBlobNamingNormalizer>();
+            containerConfiguration.NamingNormalizers.TryAdd<FileSystemBlobNamingNormalizer>();
 
             fileSystemConfigureAction(new FileSystemBlobProviderConfiguration(containerConfiguration));
 
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs
index 6d53ddc954..8906859edf 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs
@@ -27,7 +27,7 @@ namespace Volo.Abp.Collections
         /// Adds a type to list if it's not already in the list.
         /// </summary>
         /// <typeparam name="T">Type</typeparam>
-        void TryAdd<T>() where T : TBaseType;
+        bool TryAdd<T>() where T : TBaseType;
 
         /// <summary>
         /// Checks if a type exists in the list.
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs
index 24e66085f7..1f4b7ddc40 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs
@@ -60,14 +60,15 @@ namespace Volo.Abp.Collections
             _typeList.Add(typeof(T));
         }
 
-        public void TryAdd<T>() where T : TBaseType
+        public bool TryAdd<T>() where T : TBaseType
         {
             if (Contains<T>())
             {
-                return;
+                return false;
             }
 
             Add<T>();
+            return true;
         }
 
         /// <inheritdoc/>