Repository: flex-falcon Updated Branches: refs/heads/develop 980af8b28 -> b45b161c2
handle a particular scenario Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a50a38e1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a50a38e1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a50a38e1 Branch: refs/heads/develop Commit: a50a38e129d27d30e45f5982c8776fc313d1a396 Parents: 980af8b Author: Alex Harui <[email protected]> Authored: Thu Oct 1 08:06:02 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Thu Oct 1 08:06:22 2015 -0700 ---------------------------------------------------------------------- .../org/apache/flex/compiler/internal/projects/FlexProject.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a50a38e1/compiler/src/org/apache/flex/compiler/internal/projects/FlexProject.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/org/apache/flex/compiler/internal/projects/FlexProject.java index d2b3b22..625cb49 100644 --- a/compiler/src/org/apache/flex/compiler/internal/projects/FlexProject.java +++ b/compiler/src/org/apache/flex/compiler/internal/projects/FlexProject.java @@ -2094,7 +2094,9 @@ public class FlexProject extends ASProject implements IFlexProject public IDefinition doubleCheckAmbiguousDefinition(ASScope scope, String name, IDefinition def1, IDefinition def2) { IScopedDefinition scopeDef = scope.getContainingDefinition(); - String thisPackage = scopeDef.getPackageName(); + String thisPackage = (scopeDef != null) ? scopeDef.getPackageName() : + (scope instanceof PackageScope) ? ((PackageScope)scope).getDefinition().getBaseName() : + scopeDef.getPackageName(); // this should throw an error so we can see what other scenarios to handle String package1 = def1.getPackageName(); String package2 = def2.getPackageName(); // if the conflicts is against a class in the global/window package
