Log Message
Fix possible NPE.
Modified Paths
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java (2228 => 2229)
--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java 2014-01-25 00:11:19 UTC (rev 2228)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java 2014-01-25 00:39:59 UTC (rev 2229)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2011 XStream Committers.
+ * Copyright (C) 2006, 2007, 2011, 2014 XStream Committers.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
@@ -50,7 +50,7 @@
}
public void appendErrors(ErrorWriter errorWriter) {
- errorWriter.add("wrapped-converter", wrapped.getClass().getName());
+ errorWriter.add("wrapped-converter", wrapped == null ? "(null)" : wrapped.getClass().getName());
if (wrapped instanceof ErrorReporter) {
((ErrorReporter)wrapped).appendErrors(errorWriter);
}
To unsubscribe from this list please visit:
