[royale-compiler] branch develop updated: fix deps issue. make sure ther e isn't a circularity

[ah...@apache.org]

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new c719da5  fix deps issue.  make sure ther e isn't a circularity
c719da5 is described below

commit c719da5df93ffe573229c6ab23a3f7ed6cb863d0
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Jan 4 10:49:29 2019 -0800

    fix deps issue.  make sure ther e isn't a circularity
---
 .../apache/royale/compiler/internal/graph/GoogDepsWriter.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
index 019241b..88cacba 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
@@ -331,14 +331,13 @@ public class GoogDepsWriter {
 					ownerInfo.fileInfo.staticDeps = new ArrayList<String>();
 				for (String dep : info.fileInfo.deps)
 				{
-					if (!ownerInfo.fileInfo.staticDeps.contains(dep))
+					if (!ownerInfo.fileInfo.staticDeps.contains(dep) 
+							&& !isGoogClass(dep)
+							&& !dep.equals(staticOwner))
 					{
 						ownerInfo.fileInfo.staticDeps.add(dep);
-						if (!isGoogClass(dep))
-						{
-							System.out.println(staticClass + " used in static initializer of " + staticOwner + " so make " + dep + " a static dependency");
-							// all things added here should get added to graph in sortFunction
-						}
+						System.out.println(staticClass + " used in static initializer of " + staticOwner + " so make " + dep + " a static dependency");
+						// all things added here should get added to graph in sortFunction
 					}
 				}
 			}