You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2017/03/21 23:10:54 UTC
[17/50] git commit: [flex-falcon] [refs/heads/master] - compiler:
check if value for {flexVersion} token is null before trying to replace
because it will be null when running automated tests
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/master
Commit: 1fc24a703791ce699f4bf4dbd754b2825f6e8c13
Parents: de5c2b8
Author: Josh Tynjala <jo...@apache.org>
Authored: Sat Jan 14 10:14:18 2017 -0800
Committer: Josh Tynjala <jo...@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,