Fix NRE in new abstract dictionary serializers.

yfakariya · yfakariya · commit b1147e0a3ad5 · 2015-04-19T01:29:30.000+09:00
diff --git a/src/MsgPack/Serialization/CollectionSerializers/DictionaryMessagePackSerializer`3.cs b/src/MsgPack/Serialization/CollectionSerializers/DictionaryMessagePackSerializer`3.cs
@@ -54,8 +54,9 @@ public abstract class DictionaryMessagePackSerializer<TDictionary, TKey, TValue>
 		protected DictionaryMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )
 			: base( ownerContext )
 		{
-			this._keySerializer = ownerContext.GetSerializer<TKey>( schema.KeySchema );
-			this._valueSerializer = ownerContext.GetSerializer<TValue>( schema.ItemSchema );
+			var safeSchema = schema ?? PolymorphismSchema.Default;
+			this._keySerializer = ownerContext.GetSerializer<TKey>( safeSchema.KeySchema );
+			this._valueSerializer = ownerContext.GetSerializer<TValue>( safeSchema.ItemSchema );
 		}
 
 		/// <summary>
diff --git a/src/MsgPack/Serialization/CollectionSerializers/NonGenericDictionaryMessagePackSerializer`1.cs b/src/MsgPack/Serialization/CollectionSerializers/NonGenericDictionaryMessagePackSerializer`1.cs
@@ -52,8 +52,9 @@ public abstract class NonGenericDictionaryMessagePackSerializer<TDictionary> : M
 		protected NonGenericDictionaryMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )
 			: base( ownerContext )
 		{
-			this._keySerializer = ownerContext.GetSerializer( typeof( object ), schema.KeySchema );
-			this._valueSerializer = ownerContext.GetSerializer( typeof( object ), schema.ItemSchema );
+			var safeSchema = schema ?? PolymorphismSchema.Default;
+			this._keySerializer = ownerContext.GetSerializer( typeof( object ), safeSchema.KeySchema );
+			this._valueSerializer = ownerContext.GetSerializer( typeof( object ), safeSchema.ItemSchema );
 		}
 
 		/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,9 @@ public abstract class DictionaryMessagePackSerializer<TDictionary, TKey, TValue>`
`54`	`54`	`protected DictionaryMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )`
`55`	`55`	`: base( ownerContext )`
`56`	`56`	`{`
`57`		`- this._keySerializer = ownerContext.GetSerializer<TKey>( schema.KeySchema );`
`58`		`- this._valueSerializer = ownerContext.GetSerializer<TValue>( schema.ItemSchema );`
	`57`	`+ var safeSchema = schema ?? PolymorphismSchema.Default;`
	`58`	`+ this._keySerializer = ownerContext.GetSerializer<TKey>( safeSchema.KeySchema );`
	`59`	`+ this._valueSerializer = ownerContext.GetSerializer<TValue>( safeSchema.ItemSchema );`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,9 @@ public abstract class NonGenericDictionaryMessagePackSerializer<TDictionary> : M`
`52`	`52`	`protected NonGenericDictionaryMessagePackSerializer( SerializationContext ownerContext, PolymorphismSchema schema )`
`53`	`53`	`: base( ownerContext )`
`54`	`54`	`{`
`55`		`- this._keySerializer = ownerContext.GetSerializer( typeof( object ), schema.KeySchema );`
`56`		`- this._valueSerializer = ownerContext.GetSerializer( typeof( object ), schema.ItemSchema );`
	`55`	`+ var safeSchema = schema ?? PolymorphismSchema.Default;`
	`56`	`+ this._keySerializer = ownerContext.GetSerializer( typeof( object ), safeSchema.KeySchema );`
	`57`	`+ this._valueSerializer = ownerContext.GetSerializer( typeof( object ), safeSchema.ItemSchema );`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`/// <summary>`