Merge pull request #32 from roji/deserialize_empty

Fixed empty document deserialization

YamlDotNet.RepresentationModel/Serialization/Deserializer.cs

@@ -167,7 +167,9 @@ namespace YamlDotNet.RepresentationModel.Serialization
 
 			var hasDocumentStart = reader.Allow<DocumentStart>() != null;
 
-			var result = valueDeserializer.DeserializeValue(reader, type, new SerializerState(), valueDeserializer);
+			object result = null;
+			if (!reader.Accept<DocumentEnd>() && !reader.Accept<StreamEnd>())
+				result = valueDeserializer.DeserializeValue(reader, type, new SerializerState(), valueDeserializer);
 
 			if (hasDocumentStart)
 			{

YamlDotNet.RepresentationModel/Serialization/YamlSerializer.cs

@@ -296,7 +296,9 @@ namespace YamlDotNet.RepresentationModel.Serialization
 				reader.Expect<DocumentStart>();
 			}
 
-			object result = DeserializeValue(reader, serializedType, internalContext);
+			object result = null;
+			if (!reader.Accept<DocumentEnd>() && !reader.Accept<StreamEnd>())
+				result = DeserializeValue(reader, serializedType, internalContext);
 
 			if (hasDocumentStart)
 			{

YamlDotNet.UnitTests/RepresentationModel/SerializationTests.cs

@@ -1094,6 +1094,23 @@ Name: Charles
 			Assert.Equal("Brad", people[1].Name);
 			Assert.Equal("Charles", people[2].Name);
 		}
+
+		[Fact]
+		public void DeserializeEmptyDocument()
+		{
+			var deserializer = new Deserializer();
+			var arr = (int[])deserializer.Deserialize(new StringReader(""), typeof(int[]));
+			Assert.Null(arr);
+		}
+
+		[Fact]
+		[Obsolete]
+		public void DeserializeEmptyDocumentYamlDeserializer()
+		{
+			var deserializer = new YamlSerializer<int[]>();
+			var arr = deserializer.Deserialize(new StringReader(""));
+			Assert.Null(arr);
+		}
 	}
 }