diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-06 12:48:26 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-06 12:48:26 +0200 |
commit | 066fa3a6c7faf89e153f0ded74e26d97a7668b04 (patch) | |
tree | 2a22395338b43b5f7e0dbdf6a27ba5dff50cf186 /config-application-package | |
parent | 4bb69b9afd9670a91916762474e3bc6fe4257419 (diff) |
Only read from source dirs when building from Application
Diffstat (limited to 'config-application-package')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 60844b57ef0..f8318885646 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -74,7 +74,7 @@ public class FilesApplicationPackage implements ApplicationPackage { /** Creates from a directory with source files included */ public static FilesApplicationPackage fromFile(File appDir) { - return fromFile(appDir, true); + return fromFile(appDir, false); } /** @@ -661,7 +661,7 @@ public class FilesApplicationPackage implements ApplicationPackage { if (getHostsFile().exists()) { preprocessXML(new File(preprocessedDir, HOSTS), getHostsFile(), zone); } - FilesApplicationPackage preprocessed = FilesApplicationPackage.fromFile(preprocessedDir); + FilesApplicationPackage preprocessed = FilesApplicationPackage.fromFile(preprocessedDir, includeSourceFiles); preprocessed.copyUserDefsIntoApplication(); return preprocessed; } |