From c71969101b26dd4e29e5bef4c507550ebb47a9d9 Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <jonmv@users.noreply.github.com>
Date: Tue, 2 Jan 2018 13:58:54 +0100
Subject: Revert "Jvenstad/zone cleanup 4"

---
 .../com/yahoo/application/preprocessor/ApplicationPreprocessor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application-preprocessor/src')

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 fa9dfe69c5d..303ce3e8d29 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(
-                new Zone(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())),
+                ZoneId.from(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())),
                 (a, b) -> { },
                 logger);
         preprocessed.validateXML();
-- 
cgit v1.2.3