Log Message
Fix initialization of typeToConverterMap.
Modified Paths
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/core/DefaultConverterLookup.java (2103 => 2104)
--- trunk/xstream/src/java/com/thoughtworks/xstream/core/DefaultConverterLookup.java 2013-07-20 15:37:43 UTC (rev 2103)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/core/DefaultConverterLookup.java 2013-08-27 06:53:56 UTC (rev 2104)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2004, 2005, 2006 Joe Walnes.
- * Copyright (C) 2006, 2007, 2008, 2009, 2011 XStream Committers.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2013 XStream Committers.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
@@ -19,7 +19,6 @@
import com.thoughtworks.xstream.mapper.Mapper;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.WeakHashMap;
@@ -34,9 +33,10 @@
public class DefaultConverterLookup implements ConverterLookup, ConverterRegistry, Caching {
private final PrioritizedList converters = new PrioritizedList();
- private transient Map typeToConverterMap = Collections.synchronizedMap(new WeakHashMap());
+ private transient Map typeToConverterMap;
public DefaultConverterLookup() {
+ readResolve();
}
/**
@@ -83,7 +83,7 @@
}
private Object readResolve() {
- typeToConverterMap = Collections.synchronizedMap(new HashMap());
+ typeToConverterMap = Collections.synchronizedMap(new WeakHashMap());
return this;
}
}
To unsubscribe from this list please visit:
