Log Message
XStream.unmarshal may throw NPE is version info of manifest is missing (XSTR-736).
Modified Paths
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java (2064 => 2065)
--- trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java 2013-05-13 17:00:36 UTC (rev 2064)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java 2013-05-24 22:53:04 UTC (rev 2065)
@@ -1060,7 +1060,8 @@
} catch (ConversionException e) {
Package pkg = getClass().getPackage();
- e.add("version", pkg != null ? pkg.getImplementationVersion() : "not available");
+ String version = pkg != null ? pkg.getImplementationVersion() : null;
+ e.add("version", version != null ? version : "not available");
throw e;
}
}
Modified: trunk/xstream-distribution/src/content/changes.html (2064 => 2065)
--- trunk/xstream-distribution/src/content/changes.html 2013-05-13 17:00:36 UTC (rev 2064)
+++ trunk/xstream-distribution/src/content/changes.html 2013-05-24 22:53:04 UTC (rev 2065)
@@ -66,6 +66,7 @@
<li>Current IBM JDK for Java 1.4.2 no longer has a reverse field ordering.</li>
<li>JIRA:XSTR-457: Do not write 'defined-in' attribute it not needed.</li>
<li>JettisonMappedXmlDriver provides better support to overwrite its create methods.</li>
+ <li>JIRA:XSTR-736: XStream.unmarshal may throw NPE is version info of manifest is missing.</li>
</ul>
<h2>API changes</h2>
To unsubscribe from this list please visit:
