Fixing issues with how multi load can now return nulls

ravendb · Jan 30, 2012 · 47a7293 · cubanx · Feb 8, 2012 · ayende
1 parent 85bf5d7
commit 47a7293
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/Raven.Client.Lightweight/Connection/SerializationHelper.cs b/Raven.Client.Lightweight/Connection/SerializationHelper.cs
@@ -27,22 +27,31 @@ public static class SerializationHelper
 		///</summary>
 		public static IEnumerable<JsonDocument> RavenJObjectsToJsonDocuments(IEnumerable<RavenJObject> responses)
 		{
-			return (from doc in responses
-					let metadata = doc["@metadata"] as RavenJObject
-					let _ = doc.Remove("@metadata")
-					let key = Extract(metadata, "@id", string.Empty)
-					let lastModified = Extract(metadata, Constants.LastModified, SystemTime.Now, (string d) => ConvertToUtcDate(d))
-					let etag = Extract(metadata, "@etag", Guid.Empty, (string g) => new Guid(g))
-					let nai = Extract(metadata, "Non-Authoritative-Information", false, (string b) => Convert.ToBoolean(b))
-					select new JsonDocument
+			var list = new List<JsonDocument>();
+			foreach (var doc in responses)
+			{
+				if(doc == null)
 results.Any(x => x.NonAuthoritiveInformation ?? false) && 
 results.Any(x => x.NonAuthoritiveInformation ?? false) && 
+				{
+					list.Add(null);
+					continue;
+				}
+				var metadata = (RavenJObject)doc["@metadata"];
+				doc.Remove("@metadata");
+				var key = Extract(metadata, "@id", string.Empty);
+				var lastModified = Extract(metadata, Constants.LastModified, SystemTime.Now, (string d) => ConvertToUtcDate(d));
+				var etag = Extract(metadata, "@etag", Guid.Empty, (string g) => new Guid(g));
+				var nai = Extract(metadata, "Non-Authoritative-Information", false, (string b) => Convert.ToBoolean(b));
+				list.Add(new JsonDocument
 					{
 						Key = key,
 						LastModified = lastModified,
 						Etag = etag,
 						NonAuthoritativeInformation = nai,
 						Metadata = metadata.FilterHeaders(isServerDocument: false),
 						DataAsJson = doc,
-					}).ToList();
+					});
+			}
+			return list;
 		}
 
 		///<summary>

diff --git a/Raven.Client.Lightweight/Document/SessionOperations/MultiLoadOperation.cs b/Raven.Client.Lightweight/Document/SessionOperations/MultiLoadOperation.cs
@@ -74,7 +74,7 @@ public T[] Complete<T>()
 			}
 
 			return results
-				.Select(sessionOperations.TrackEntity<T>)
+				.Select(document => document == null ? default(T) : sessionOperations.TrackEntity<T>(document))
 				.ToArray();
 		}
 	}