Merge pull request #113 from lyubomyr-shaydariv/master

luontola · web-flow · commit 5069d3087437 · 2017-01-10T15:11:08.000+02:00
Fix NullPointerException in ClassInfo accepting java.lang.Object
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/interfaces/ClassInfo.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/interfaces/ClassInfo.java
@@ -30,7 +30,7 @@ public ClassInfo(ClassReader cr) {
         this.reader = cr;
         this.access = cr.getAccess();
         this.type = Type.getObjectType(cr.getClassName());
-        this.superclass = Type.getObjectType(cr.getSuperName());
+        this.superclass = cr.getSuperName() != null ? Type.getObjectType(cr.getSuperName()) : null;
         for (String iface : cr.getInterfaces()) {
             this.interfaces.add(Type.getObjectType(iface));
         }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public ClassInfo(ClassReader cr) {`
`30`	`30`	`this.reader = cr;`
`31`	`31`	`this.access = cr.getAccess();`
`32`	`32`	`this.type = Type.getObjectType(cr.getClassName());`
`33`		`- this.superclass = Type.getObjectType(cr.getSuperName());`
	`33`	`+ this.superclass = cr.getSuperName() != null ? Type.getObjectType(cr.getSuperName()) : null;`
`34`	`34`	`for (String iface : cr.getInterfaces()) {`
`35`	`35`	`this.interfaces.add(Type.getObjectType(iface));`
`36`	`36`	`}`