Log Message
Clean-up.
Modified Paths
- trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java
- trunk/xstream-distribution/src/content/changes.html
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java (1967 => 1968)
--- trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java 2012-03-21 01:14:14 UTC (rev 1967)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java 2012-03-21 01:17:55 UTC (rev 1968)
@@ -618,7 +618,7 @@
if (JVM.is15()) {
aliasDynamically("duration", "javax.xml.datatype.Duration");
- aliasDynamically("concurrent-hash-map", "java.util.concurrent.ConcurrentHashMap");
+ alias("concurrent-hash-map", jvm.loadClass("java.util.concurrent.ConcurrentHashMap"));
alias("enum-set", jvm.loadClass("java.util.EnumSet"));
alias("enum-map", jvm.loadClass("java.util.EnumMap"));
alias("string-builder", jvm.loadClass("java.lang.StringBuilder"));
Modified: trunk/xstream-distribution/src/content/changes.html (1967 => 1968)
--- trunk/xstream-distribution/src/content/changes.html 2012-03-21 01:14:14 UTC (rev 1967)
+++ trunk/xstream-distribution/src/content/changes.html 2012-03-21 01:17:55 UTC (rev 1968)
@@ -35,13 +35,13 @@
<h2>Major changes</h2>
<ul>
+ <li>Support java.util.concurrent.ConcurrentHashMap with the MapConverter. This will also avoid a bug in JRockit
+ JDK reported in JIRA:XSTR-608.</li>
</ul>
<h2>Minor changes</h2>
<ul>
- <li>Support java.util.concurrent.ConcurrentHashMap with the MapConverter. This will also avoid a bug in JRockit
- JDK reported in JIRA:XSTR-608.</li>
<li>JVM.loadClass will now also initialize the loaded class and ignore any occurring LinkageError.</li>
<li>JIRA:XSTR-596: SubjectConverter will be no longer registered if initialization of javax.security.auth.Subject fails.</li>
<li>JIRA:XSTR-683: Inheritance of implicit collections, arrays or maps is dependent on declaration sequence.</li>
To unsubscribe from this list please visit:
