[royale-compiler] 02/02: MXMLClassReferenceNodeBase: fixed null reference exception when child tag does not have a namespace URI (references #102)

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit b4c054dca217b158d28b085322151066a1276f10
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Dec 2 07:53:22 2019 -0800

    MXMLClassReferenceNodeBase: fixed null reference exception when child tag does not have a namespace URI (references #102)
---
 .../compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
index bc5d7bd..567383d 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
@@ -525,7 +525,7 @@ abstract class MXMLClassReferenceNodeBase extends MXMLNodeBase implements IMXMLC
                 if (defaultPropertyDefinition != null && !processedDefaultProperty && defaultPropertyDefinition.getBaseName().equals("text"))
                 {
                 	String uri = childTag.getURI();
-                	if (uri.equals("http://www.w3.org/1999/xhtml"))
+                	if (uri != null && uri.equals("http://www.w3.org/1999/xhtml"))
                 	{
                         IVariableDefinition htmlDef = (IVariableDefinition)project.resolveSpecifier(classReference, "html");
                         if (htmlDef != null)
@@ -542,7 +542,7 @@ abstract class MXMLClassReferenceNodeBase extends MXMLNodeBase implements IMXMLC
                 else if (altDefaultPropertyDefinition != null && !processedDefaultProperty && altDefaultPropertyDefinition.getBaseName().equals("innerHTML"))
                 {
                 	String uri = childTag.getURI();
-                	if (uri.equals("library://ns.apache.org/royale/html"))
+                	if (uri != null && uri.equals("library://ns.apache.org/royale/html"))
                 	{
                         IVariableDefinition textDef = (IVariableDefinition)project.resolveSpecifier(classReference, "innerHTML");
                         if (textDef != null)