Merge pull request #1198 from NativeScript/master

Vasil Hristov · web-flow · commit 45775988ddd1 · 2018-10-26T16:23:38.000+03:00
RC
diff --git a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/Builder.java b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/Builder.java
@@ -112,8 +112,9 @@ private static void generate(ClassDescriptor clazz, TreeNode root) throws Except
         }
 
         TreeNode node = getOrCreateNode(root, clazz, predefinedSuperClassname);
-
-        setNodeMembers(clazz, node, root, hasClassMetadataInfo);
+        if (node != null) {
+            setNodeMembers(clazz, node, root, hasClassMetadataInfo);
+        }
     }
 
     private static void setNodeMembers(ClassDescriptor clazz, TreeNode node, TreeNode root, boolean hasClassMetadataInfo) throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,9 @@ private static void generate(ClassDescriptor clazz, TreeNode root) throws Except`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`TreeNode node = getOrCreateNode(root, clazz, predefinedSuperClassname);`
`115`		`-`
`116`		`- setNodeMembers(clazz, node, root, hasClassMetadataInfo);`
	`115`	`+ if (node != null) {`
	`116`	`+ setNodeMembers(clazz, node, root, hasClassMetadataInfo);`
	`117`	`+ }`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`private static void setNodeMembers(ClassDescriptor clazz, TreeNode node, TreeNode root, boolean hasClassMetadataInfo) throws Exception {`