Merge branch '2.x' of github.com:elastic/elasticsearch-net into 2.x

Author: Mpdreamz

src/Elasticsearch.Net/Auditing/Audit.cs

@@ -40,7 +40,7 @@ public Audit(AuditEvent type, DateTime started)
 
 		public override string ToString()
 		{
-			var took = Started - Ended;
+			var took = Ended - Started;
 			return $"Node: {Node?.Uri}, Event: {Event.GetStringValue()} NodeAlive: {Node?.IsAlive}, Took: {took}";
 		}
 	}

src/Nest/CommonAbstractions/SerializationBehavior/JsonNetSerializer.cs

@@ -35,7 +35,7 @@ public class JsonNetSerializer : IElasticsearchSerializer
 		/// The size of the buffer to use when writing the serialized request
 		/// to the request stream
 		/// </summary>
-		// Performance tests as part of https://github.com/elastic/elasticsearch-net/issues/1899 indicate this 
+		// Performance tests as part of https://github.com/elastic/elasticsearch-net/issues/1899 indicate this
 		// to be a good compromise buffer size for performance throughput and bytes allocated.
 		protected virtual int BufferSize => 1024;
 
@@ -44,7 +44,8 @@ protected virtual void ModifyJsonSerializerSettings(JsonSerializerSettings setti
 
 		protected virtual IList<Func<Type, JsonConverter>> ContractConverters => null;
 
-		protected readonly ConcurrentDictionary<int, IPropertyMapping> Properties = new ConcurrentDictionary<int, IPropertyMapping>();
+		protected ConcurrentDictionary<int, IPropertyMapping> Properties => throw new Exception("subclass of JsonNetSerializer should not call this field");
+		protected readonly ConcurrentDictionary<string, IPropertyMapping> PropertiesFixed = new ConcurrentDictionary<string, IPropertyMapping>();
 
 		public JsonNetSerializer(IConnectionSettingsValues settings, Action<JsonSerializerSettings, IConnectionSettingsValues> settingsModifier) : this(settings, null, settingsModifier) { }
 
@@ -102,9 +103,11 @@ public virtual void Serialize(object data, Stream writableStream, SerializationF
 		public virtual IPropertyMapping CreatePropertyMapping(MemberInfo memberInfo)
 		{
 			IPropertyMapping mapping;
-			if (Properties.TryGetValue(memberInfo.GetHashCode(), out mapping)) return mapping;
+			var memberInfoString = $"{memberInfo.DeclaringType?.FullName}.{memberInfo.Name}";
+			if (PropertiesFixed.TryGetValue(memberInfoString, out mapping))
+				return mapping;
 			mapping =  PropertyMappingFromAttributes(memberInfo);
-			this.Properties.TryAdd(memberInfo.GetHashCode(), mapping);
+			this.PropertiesFixed.TryAdd(memberInfoString, mapping);
 			return mapping;
 		}