Log Message
FieldDictionary may call sort of FieldKeySorter implementation with wrong type as key.
Modified Paths
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/FieldDictionary.java (1960 => 1961)
--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/FieldDictionary.java 2012-02-15 20:42:14 UTC (rev 1960)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/FieldDictionary.java 2012-02-23 23:16:14 UTC (rev 1961)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2004, 2005, 2006 Joe Walnes.
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 XStream Committers.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 XStream Committers.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
@@ -160,7 +160,7 @@
}
keyedByFieldKey.put(fieldKey, field);
}
- final Map sortedFieldKeys = sorter.sort(type, keyedByFieldKey);
+ final Map sortedFieldKeys = sorter.sort(cls, keyedByFieldKey);
keyedByFieldNameCache.put(cls, keyedByFieldName);
keyedByFieldKeyCache.put(cls, sortedFieldKeys);
lastKeyedByFieldName = keyedByFieldName;
Modified: trunk/xstream-distribution/src/content/changes.html (1960 => 1961)
--- trunk/xstream-distribution/src/content/changes.html 2012-02-15 20:42:14 UTC (rev 1960)
+++ trunk/xstream-distribution/src/content/changes.html 2012-02-23 23:16:14 UTC (rev 1961)
@@ -1,7 +1,7 @@
<html>
<!--
Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 XStream committers.
All rights reserved.
The software in this package is published under the terms of the BSD
@@ -39,6 +39,7 @@
<li>JIRA:XSTR-685: Deserialization from file or URL keeps stream open.</li>
<li>JIRA:XSTR-684: XML 1.0 character validation fails for characters from 0x10 to 0x1f.</li>
<li>SerializableConverter is broken if the serialized type is the default implementation.</li>
+ <li>FieldDictionary may call sort of FieldKeySorter implementation with wrong type as key.</li>
</ul>
<h1 id="1.4.2">1.4.2</h1>
To unsubscribe from this list please visit:
