flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [44/50] git commit: [flex-falcon] [refs/heads/master] - handle null
Date Wed, 06 Apr 2016 15:02:53 GMT
handle null


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0d5b35f0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0d5b35f0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0d5b35f0

Branch: refs/heads/master
Commit: 0d5b35f018da4c85b3e7361ae1686f53ff03ab6e
Parents: 0d4d871
Author: Alex Harui <aharui@apache.org>
Authored: Sun Mar 20 22:19:23 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Mar 21 21:01:45 2016 -0700

----------------------------------------------------------------------
 .../org/apache/flex/compiler/internal/projects/FlexJSProject.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0d5b35f0/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
b/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index 67657f7..15cf7ab 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -266,7 +266,8 @@ public class FlexJSProject extends FlexProject
     {
         if (baseDefinition == overrideDefinition)
         	return true;
-        if (overrideDefinition.isInstanceOf(baseDefinition.getQualifiedName(), this))
+        if (overrideDefinition != null && baseDefinition != null &&
+        		overrideDefinition.isInstanceOf(baseDefinition.getQualifiedName(), this))
         	return true;
         return false;
     }


Mime
View raw message