You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/09/22 06:41:00 UTC

git commit: [flex-falcon] [refs/heads/develop] - fix npe

Repository: flex-falcon
Updated Branches:
  refs/heads/develop b7e9b15f0 -> 1dc3e4851


fix npe


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

Branch: refs/heads/develop
Commit: 1dc3e4851c266d6a2a6212ad750d70143945ac31
Parents: b7e9b15
Author: Alex Harui <ah...@apache.org>
Authored: Wed Sep 21 23:40:51 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Sep 21 23:40:51 2016 -0700

----------------------------------------------------------------------
 .../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1dc3e485/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index e3d650f..7ef928c 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -254,9 +254,10 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
 	            			if (mxmlFile != null)
 	            			{
 	            				ITargetAttributes attrs = mxmlFile.getTargetAttributes(flexJSProject);
-	            				if (!attrs.getUsePreloader())
+	            				if (attrs != null && attrs.getUsePreloader() != null)
 	            				{
-	            					String preloaderInject = sep + IMXMLLanguageConstants.ATTRIBUTE_USE_PRELOADER + ": false";
+	            					String preloaderInject = sep + IMXMLLanguageConstants.ATTRIBUTE_USE_PRELOADER + ": ";
+	            					preloaderInject += attrs.getUsePreloader() == Boolean.TRUE ? "true" : "false";
 	        		            	sep = ",\n";
 	        		            	infoInject += preloaderInject;
 	            				}