Log Message
ReflectionConverter cannot handle "null" type and should not throw a NPE if it is asked to convert it (XSTR-749).
Modified Paths
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.java (2187 => 2188)
--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.java 2013-12-12 21:07:27 UTC (rev 2187)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ReflectionConverter.java 2013-12-17 09:17:08 UTC (rev 2188)
@@ -20,6 +20,6 @@
}
public boolean canConvert(Class type) {
- return canAccess(type);
+ return type != null && canAccess(type);
}
}
Modified: trunk/xstream-distribution/src/content/changes.html (2187 => 2188)
--- trunk/xstream-distribution/src/content/changes.html 2013-12-12 21:07:27 UTC (rev 2187)
+++ trunk/xstream-distribution/src/content/changes.html 2013-12-17 09:17:08 UTC (rev 2188)
@@ -38,7 +38,7 @@
<ul>
</ul>
-->
- <h1 id="upcoming">Upcoming 1.5.x</h1>
+ <h1 id="upcoming">Upcoming</h1>
<p>Not yet released.</p>
@@ -50,7 +50,21 @@
<li>No need for reflection in StackTraceElementFactory anymore since Java 5.</li>
</ul>
+ <h1 id="upcoming-1.4.x">Upcoming 1.4.x maintenance release</h1>
+ <p>Not yet released.</p>
+
+ <h2>Major changes</h2>
+
+ <ul>
+ </ul>
+
+ <h2>Minor changes</h2>
+
+ <ul>
+ <li>XSTR-749: NPE if ReflectionConverter.canConvert(type) is called with null as argument.</li>
+ </ul>
+
<h1 id="1.4.6">1.4.6</h1>
<p>Released December 12, 2013.</p>
To unsubscribe from this list please visit:
