[XSTR-736] NPE from XStream.unmarshal.

jenkinsci · May 23, 2013 · f669b43 · f669b43 · jglick · Aug 26, 2013
1 parent c86f026
commit f669b43
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xstream/src/java/com/thoughtworks/xstream/XStream.java b/xstream/src/java/com/thoughtworks/xstream/XStream.java
@@ -1063,7 +1063,8 @@ public Object unmarshal(HierarchicalStreamReader reader, Object root, DataHolder
 
         } 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;
         }
     }