[xstream-scm] [2083] trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/ ToAttributedValueConverter.java: Fix NPE.

[joehni]

Title: [2083] trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/ToAttributedValueConverter.java: Fix NPE.

Revision

2083

Author

joehni

Date

2013-07-02 18:16:07 -0500 (Tue, 02 Jul 2013)

Log Message

Fix NPE.

Modified Paths

• trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/ToAttributedValueConverter.java

Diff

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/ToAttributedValueConverter.java (2082 => 2083)

--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/ToAttributedValueConverter.java	2013-07-02 22:55:20 UTC (rev 2082)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/ToAttributedValueConverter.java	2013-07-02 23:16:07 UTC (rev 2083)
@@ -342,7 +342,7 @@
     }
     
     private static boolean isEnum(Class type) {
-        while(type != Object.class) {
+        while(type != null && type != Object.class) {
             if (type.getName().equals("java.lang.Enum")) {
                 return true;
             }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email