diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 12:43:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 12:43:40 +0100 |
| commit | e77379005bccd3d5009b1484038183a05856b4cd (patch) | |
| tree | 35545093828437f6d7704b4b6c3646a39ff50a00 /application-preprocessor | |
| parent | b73a4d2c8b5e7ae83743b10b8f21836811e5dff4 (diff) | |
| parent | 95ae8c562a8826f03bd2faad82b0ffb754133342 (diff) | |
Merge pull request #4453 from vespa-engine/jvenstad/zone-cleanup-4
Jvenstad/zone cleanup 4
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(); |