[xstream-scm] [2230] branches/v-1.4.x: Merge fix for possible NPE from trunk.

[joehni]

Title: [2230] branches/v-1.4.x: Merge fix for possible NPE from trunk.

Revision

2230

Author

joehni

Date

2014-01-24 18:41:11 -0600 (Fri, 24 Jan 2014)

Log Message

Merge fix for possible NPE from trunk.

Modified Paths

• branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java

Property Changed

branches/v-1.4.x/

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214,2216-2217,2226,2229

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java (2229 => 2230)

--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java	2014-01-25 00:39:59 UTC (rev 2229)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/converters/SingleValueConverterWrapper.java	2014-01-25 00:41:11 UTC (rev 2230)
@@ -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:

http://xircles.codehaus.org/manage_email