NPE fix, refs #73

vojtechhabarta · vojtechhabarta · commit 8f93b3ed5a7c · 2016-07-22T17:33:26.000+02:00
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java
@@ -102,7 +102,7 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
 
     private boolean isParentProperty(String property, Class<?> cls) {
         final List<Class<?>> parents = new ArrayList<>();
-        if (cls.getSuperclass() != Object.class) {
+        if (cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
             parents.add(cls.getSuperclass());
         }
         parents.addAll(Arrays.asList(cls.getInterfaces()));

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {`
`102`	`102`
`103`	`103`	`private boolean isParentProperty(String property, Class<?> cls) {`
`104`	`104`	`final List<Class<?>> parents = new ArrayList<>();`
`105`		`- if (cls.getSuperclass() != Object.class) {`
	`105`	`+ if (cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {`
`106`	`106`	`parents.add(cls.getSuperclass());`
`107`	`107`	`}`
`108`	`108`	`parents.addAll(Arrays.asList(cls.getInterfaces()));`