[BUG FIX] check that key is not already in attribute dictionary's

Author: lanesCSO

rls/log4net.config

@@ -22,7 +22,7 @@
       <threshold value="ERROR" />
     </evaluator>
     <!-- List of comma separated emails for the recipients -->
-    <to value="" />
+     <to value="" />
     <!-- Email of the sender -->
     <from value="" />
     <!-- Email's subject -->

rls/packages/API.Library.7.0.1.nupkg

@@ -12,27 +12,12 @@
     <PackageId>API.Library</PackageId>
     <Product>API Library</Product>
     <Copyright>Central Statistics Office, Ireland</Copyright>
-    <Version>7.0.0</Version>
+    <Version>7.0.1</Version>
     <Authors>Central Statistics Office, Ireland</Authors>
     <SignAssembly>False</SignAssembly>
     <RepositoryUrl>https://github.com/CSOIreland/Server-API-Library</RepositoryUrl>
     <PackageReleaseNotes>
-      - [ENHANCEMENT] removed references to classes that are not required for the API. They are now moved to different projects
-      - [BUG FIX] parse error function in restful had a default of " " instead of ""
-      - [BUG FIX] changed accessibility level of MemcachedClient to be internal
-      - [ENHANCEMENT] added logging of networkusername when AD connectivity issue
-      - [ENHANCEMENT] use method handle and static dictionary to speed up reflection lookup
-      - [BUG FIX] handle custom sql datatypes on non query procedure
-      - [BUG FIX] Dispose of database connection if it can't be opened
-      - [ENHANCEMENT] memcache CAS locking for casrepositoryflush implemented
-      - [ENHANCEMENT] updated libraries -- sqlclient, enyim and log4net
-      - [ENHANCEMENT] move interfaces to interfaces directory
-      - [ENHANCEMENT] remove CustomPropertyAttributes.cs as now in CSOSanitiser
-      - [BUG FIX] removed  internal set bug --   public int API_ADO_BULKCOPY_TIMEOUT { get; internal set; }
-      - [ENHANCEMENT] change activity declaration type in Middleware/API.Middleware.
-      - [BUG FIX] parse error function in restful had a default of " " instead of ""
-      - [BUG FIX] changed accessibility level of MemcachedClient to be internal
-      - [ENHANCEMENT] added logging of networkusername when AD connectivity issue
+      - [BUG FIX] check that key is not already in attribute dictionarys
     </PackageReleaseNotes>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <RestoreLockedMode>true</RestoreLockedMode>

src/API.Library/API.Library.csproj

@@ -152,7 +152,7 @@ private void ReadAppSettings()
             else if (ApiServicesHelper.APIConfig.Settings_Type == "DB")
             {
                 apiConfiguration = ReadDBAppSettings(new ADO());
-
+                
                 if (version == null)
                 {
                     //update memcache

src/API.Library/Config/ApiConfiguration.cs

@@ -502,6 +502,7 @@ internal void GatherTraceInformation(dynamic apiRequest, Trace trace)
         /// </summary>
         internal static MethodInfo CheckAPICallsAllowed(string methodName, string methodPath, dynamic typeOfClassType)
         {
+           
             //create key for the dictionary
             dynamic jsonObj = new ExpandoObject();
             jsonObj.methodName = methodName;
@@ -543,7 +544,10 @@ internal static MethodInfo CheckAPICallsAllowed(string methodName, string method
                             RuntimeMethodHandle handle = methodInfo.MethodHandle;
 
                             //add handle to dictionary for future lookup
-                            AttributeDictionary.AllowedAPIDictionary.Add(serializedAPIInfo, handle);
+                            if (!AttributeDictionary.AllowedAPIDictionary.TryAdd(serializedAPIInfo, handle))
+                           {
+                                Log.Instance.Debug("Adding : " + serializedAPIInfo + " to dictionary 'CheckAPICallsAllowed' failed");
+                           }
                             return methodInfo;
                         }
                     }

src/API.Library/Entities/API.Common.cs

@@ -89,9 +89,14 @@ public static CustomAttributeData MethodAttributeValue(string method, string att
 
                 //get the methods handle
                 RuntimeMethodHandle handle = methodInfo.MethodHandle;
-                      
+
                 //add handle to dictionary for future lookup
-                AttributeDictionary.DictMethodAttributeValue.Add(serializedAPIInfo, handle);
+
+                if (!AttributeDictionary.DictMethodAttributeValue.TryAdd(serializedAPIInfo, handle))
+                {
+                    Log.Instance.Debug("Adding : " + serializedAPIInfo + " to dictionary 'DictMethodAttributeValue' failed");
+                }
+                             
 
                 //Return true or false depending on whether the attribute was found
                 return searchedAttribute;
@@ -186,7 +191,11 @@ public static bool MethodHasAttribute(string method, string attributeName, Type[
                     RuntimeMethodHandle handle = methodInfo.MethodHandle;
 
                     //add handle to dictionary for future lookup
-                    AttributeDictionary.DictMethodHasAttribute.Add(serializedAPIInfo, handle);
+                    if (!AttributeDictionary.DictMethodHasAttribute.TryAdd(serializedAPIInfo, handle))
+                    {
+                        Log.Instance.Debug("Adding : " + serializedAPIInfo + " to dictionary 'DictMethodHasAttribute' failed");
+                    }
+                
 
                     //Return true or false depending on whether the attribute was found
                     return searchedAttribute != null;