diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-01-03 11:06:26 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-01-03 11:06:26 +0100 |
commit | 0eab0f1de57dc41cd6eecce1365666cd05a94ec0 (patch) | |
tree | 4a0a483c19f48287eef54f401e227f7d86d058fe /application-preprocessor | |
parent | 96373e3f8379d3e4783d87733b32458fd4e18007 (diff) |
Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""
This reverts commit 7b99d259bf378c0e5c43c9a199efffdf056678f4.
Diffstat (limited to 'application-preprocessor')
-rw-r--r-- | application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java index 303ce3e8d29..fa9dfe69c5d 100644 --- a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java +++ b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java @@ -39,7 +39,7 @@ public class ApplicationPreprocessor { FilesApplicationPackage.Builder applicationPackageBuilder = new FilesApplicationPackage.Builder(applicationDir); outputDir.ifPresent(applicationPackageBuilder::preprocessedDir); ApplicationPackage preprocessed = applicationPackageBuilder.build().preprocess( - ZoneId.from(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())), + new Zone(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())), (a, b) -> { }, logger); preprocessed.validateXML(); |