flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshtynj...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - compiler: check if value for {flexVersion} token is null before trying to replace because it will be null when running automated tests
Date Sat, 14 Jan 2017 18:14:25 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop de5c2b85b -> 1fc24a703


compiler: check if value for {flexVersion} token is null before trying to replace because
it will be null when running automated tests


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

Branch: refs/heads/develop
Commit: 1fc24a703791ce699f4bf4dbd754b2825f6e8c13
Parents: de5c2b8
Author: Josh Tynjala <joshtynjala@apache.org>
Authored: Sat Jan 14 10:14:18 2017 -0800
Committer: Josh Tynjala <joshtynjala@apache.org>
Committed: Sat Jan 14 10:14:18 2017 -0800

----------------------------------------------------------------------
 .../java/org/apache/flex/compiler/config/Configuration.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1fc24a70/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
index f37b9f7..3fbf713 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
@@ -3964,7 +3964,11 @@ public class Configuration
         for (String pathElement : pathElements)
         {
             pathElement = expandRuntimeTokens(pathElement, configurationValue.getBuffer());
-            pathElement = pathElement.replace(FLEX_VERSION_TOKEN, getClass().getPackage().getImplementationVersion());
+            String flexVersion =  getClass().getPackage().getImplementationVersion();
+            if (flexVersion != null)
+            {
+                pathElement = pathElement.replace(FLEX_VERSION_TOKEN, flexVersion);
+            }
 
             String playerExpandedPath = pathElement.replaceAll(TARGET_PLAYER_MAJOR_VERSION_TOKEN_REGEX_ESCAPED,
                     targetPlayerMajorVersion).replaceAll(TARGET_PLAYER_MINOR_VERSION_TOKEN_REGEX_ESCAPED,


Mime
View raw message