-Fixed potential multi-threading serializing issue

This commit is contained in:
JamesNK
2012-01-16 07:22:26 +00:00
parent faf6426527
commit 45cbd34daa
2 changed files with 2 additions and 2 deletions
@@ -107,7 +107,7 @@ namespace Newtonsoft.Json.Serialization
private void EnsureGenericWrapperCreator() private void EnsureGenericWrapperCreator()
{ {
if (_genericWrapperType == null) if (_genericWrapperCreator == null)
{ {
_genericWrapperType = ReflectionUtils.MakeGenericType(typeof (CollectionWrapper<>), CollectionItemType); _genericWrapperType = ReflectionUtils.MakeGenericType(typeof (CollectionWrapper<>), CollectionItemType);
@@ -92,7 +92,7 @@ namespace Newtonsoft.Json.Serialization
if (dictionary is IDictionary && (DictionaryValueType == null || !_isDictionaryValueTypeNullableType)) if (dictionary is IDictionary && (DictionaryValueType == null || !_isDictionaryValueTypeNullableType))
return new DictionaryWrapper<object, object>((IDictionary)dictionary); return new DictionaryWrapper<object, object>((IDictionary)dictionary);
if (_genericWrapperType == null) if (_genericWrapperCreator == null)
{ {
_genericWrapperType = ReflectionUtils.MakeGenericType(typeof(DictionaryWrapper<,>), DictionaryKeyType, DictionaryValueType); _genericWrapperType = ReflectionUtils.MakeGenericType(typeof(DictionaryWrapper<,>), DictionaryKeyType, DictionaryValueType);