fixed concurrency issues

Author: Mpdreamz

src/Nest/Resolvers/IdResolver.cs

@@ -9,6 +9,7 @@ namespace Nest.Resolvers
 	public class IdResolver
 	{
 		private readonly IConnectionSettingsValues _connectionSettings;
+		private ConcurrentDictionary<Type, Func<object, string>> LocalIdDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
 		private static ConcurrentDictionary<Type, Func<object, string>> IdDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
 		private static MethodInfo MakeDelegateMethodInfo = typeof(IdResolver).GetMethod("MakeDelegate", BindingFlags.Static | BindingFlags.NonPublic);
 
@@ -56,7 +57,14 @@ public string GetIdFor<T>(T @object)
 
 			var type = typeof(T);
 			Func<object, string> cachedLookup;
-			if (IdDelegates.TryGetValue(type, out cachedLookup))
+			string propertyName;
+
+			var preferLocal = this._connectionSettings.IdProperties.TryGetValue(type, out propertyName);
+			
+			if (LocalIdDelegates.TryGetValue(type, out cachedLookup))
+				return cachedLookup(@object);
+
+			if (!preferLocal && IdDelegates.TryGetValue(type, out cachedLookup))
 				return cachedLookup(@object);
 
 			var idProperty = GetInferredId(type);
@@ -75,7 +83,10 @@ public string GetIdFor<T>(T @object)
 					var v = func(obj);
 					return v != null ? v.ToString() : null;
 				};
-				IdDelegates.TryAdd(type, cachedLookup);
+				if (preferLocal) 
+					LocalIdDelegates.TryAdd(type, cachedLookup);
+				else 
+					IdDelegates.TryAdd(type, cachedLookup);
 				return cachedLookup(@object);
 			}
 			catch 

src/Nest/Resolvers/TypeNameResolver.cs

@@ -7,13 +7,11 @@ namespace Nest.Resolvers
 	public class TypeNameResolver
 	{
 		private readonly IConnectionSettingsValues _connectionSettings;
-		private PropertyNameResolver _propertyNameResolver;
 
 		public TypeNameResolver(IConnectionSettingsValues connectionSettings)
 		{
 			connectionSettings.ThrowIfNull("connectionSettings");
 			this._connectionSettings = connectionSettings;
-			this._propertyNameResolver = new PropertyNameResolver(this._connectionSettings);
 		}
 
 		public string GetTypeNameFor<T>()

src/Tests/Nest.Tests.Unit/Internals/Inferno/MapIdPropertyForTests.cs

@@ -118,6 +118,7 @@ public void IdPropertyMapped_And_TypeHasIdPropertyAttribute_MappingTakesPreceden
 			};
 
 			Assert.AreEqual(doc.Id, client.Infer.Id<IdPropertyTestWithAttribute>(doc));
+			Assert.AreEqual(doc.Id, client.Infer.Id<IdPropertyTestWithAttribute>(doc));
 		}
 	}
 }