Fixed failing unit test in release mode (serializers should be able to handle null streams even if it only happens in RELEASE unit tests).

Also improved MaxRetryExceptionMessage to include inner stack traces (so pinpointing the exact cause is much much easier).

Author: Mpdreamz

Diff for: src/Elasticsearch.Net/Connection/Transport.cs

@@ -23,7 +23,7 @@ public class Transport : ITransport
 		const int BUFFER_SIZE = 4096;
 
 		protected static readonly string MaxRetryExceptionMessage = "Failed after retrying {2} times: '{0} {1}'. {3}";
-		protected static readonly string MaxRetryInnerMessage = "InnerException: {0}, InnerMessage: {1}";
+		protected static readonly string MaxRetryInnerMessage = "InnerException: {0}, InnerMessage: {1}, InnerStackTrace: {2}";
 		protected internal readonly IConnectionConfigurationValues ConfigurationValues;
 		protected internal readonly IConnection Connection;
 		private readonly IElasticsearchSerializer _serializer;
@@ -488,12 +488,12 @@ private static string CreateMaxRetryExceptionMessage<T>(TransportRequestState<T>
 
 					aggregate = aggregate.Flatten();
 					var innerExceptions = aggregate.InnerExceptions
-						.Select(ae => MaxRetryInnerMessage.F(ae.GetType().Name, ae.Message))
+						.Select(ae => MaxRetryInnerMessage.F(ae.GetType().Name, ae.Message, ae.StackTrace))
 						.ToList();
 					innerException = string.Join("\r\n", innerExceptions);
 				}
 				else
-					innerException = MaxRetryInnerMessage.F(e.GetType().Name, e.Message);
+					innerException = MaxRetryInnerMessage.F(e.GetType().Name, e.Message, e.StackTrace);
 			}
 			var exceptionMessage = MaxRetryExceptionMessage
 				.F(requestState.Method, requestState.Path, requestState.Retried, innerException);

Diff for: src/Elasticsearch.Net/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 // <auto-generated/>
-
-using System;
 using System.Reflection;
 
 [assembly: AssemblyTitleAttribute("Elasticsearch.Net")]
@@ -10,8 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
-[assembly: CLSCompliant(true)]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-ci20140710110619")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";

Diff for: src/Elasticsearch.Net/Serialization/ElasticsearchDefaultSerializer.cs

@@ -15,11 +15,10 @@ public T Deserialize<T>(byte[] bytes) where T : class
 		}
 		public T Deserialize<T>(Stream stream)
 		{
-			var ms = stream as MemoryStream;
-			//if (ms != null)
-			// return SimpleJson.DeserializeObject<T>(ms.GetBuffer().Utf8String());
+			if (stream == null)
+				return default(T);
 
-			using (ms = new MemoryStream())
+			using (var ms = new MemoryStream())
 			{
 				stream.CopyTo(ms);
 				byte[] buffer = ms.ToArray();
@@ -31,6 +30,12 @@ public T Deserialize<T>(Stream stream)
 		public Task<T> DeserializeAsync<T>(Stream stream)
 		{
 			var tcs = new TaskCompletionSource<T>();
+			if (stream == null)
+			{
+				tcs.SetResult(default(T));
+				return tcs.Task;
+			}
+
 			using (var ms = new MemoryStream())
 			{
 				// return a task that reads the stream asynchronously 

Diff for: src/Nest/ExposedInternals/NestSerializer.cs

@@ -82,6 +82,8 @@ public string Stringify(object valueType)
 		/// <param name="deserializationState">Optional deserialization state</param>
 		public virtual T Deserialize<T>(Stream stream)
 		{
+			if (stream == null) return default(T);
+
 			var settings = this._serializationSettings;
 
 			return _Deserialize<T>(stream, settings);
@@ -92,6 +94,7 @@ public virtual T Deserialize<T>(Stream stream)
 		/// </summary>
 		public T DeserializeInternal<T>(Stream stream, JsonConverter converter)
 		{
+			if (stream == null) return default(T);
 			if (converter == null) return this.Deserialize<T>(stream);
 
 			var serializer = JsonSerializer.Create(this.CreateSettings(converter));
@@ -103,6 +106,7 @@ public T DeserializeInternal<T>(Stream stream, JsonConverter converter)
 
 		protected internal T _Deserialize<T>(Stream stream, JsonSerializerSettings settings = null)
 		{
+			if (stream == null) return default(T);
 			settings = settings ?? _serializationSettings;
 			var serializer = JsonSerializer.Create(settings);
 			var jsonTextReader = new JsonTextReader(new StreamReader(stream));
@@ -121,6 +125,11 @@ public virtual Task<T> DeserializeAsync<T>(Stream stream)
 			//figure out wheter reading the stream async on our own might be beneficial 
 			//over memory possible memory usage
 			var tcs = new TaskCompletionSource<T>();
+			if (stream == null)
+			{
+				tcs.SetResult(default(T));
+				return tcs.Task;
+			}
 			var r = this.Deserialize<T>(stream);
 			tcs.SetResult(r);
 			return tcs.Task;