summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-06 12:48:26 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-06 12:48:26 +0200
commit066fa3a6c7faf89e153f0ded74e26d97a7668b04 (patch)
tree2a22395338b43b5f7e0dbdf6a27ba5dff50cf186 /configserver
parent4bb69b9afd9670a91916762474e3bc6fe4257419 (diff)
Only read from source dirs when building from Application
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java
index abffb002a76..33671b84d72 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java
@@ -24,8 +24,7 @@ public class PermanentApplicationPackage {
public PermanentApplicationPackage(ConfigserverConfig config) {
File app = new File(Defaults.getDefaults().underVespaHome(config.applicationDirectory()));
- applicationPackage = Optional.<ApplicationPackage>ofNullable(app.exists() ?
- FilesApplicationPackage.fromFile(app) : null);
+ applicationPackage = Optional.<ApplicationPackage>ofNullable(app.exists() ? FilesApplicationPackage.fromFile(app) : null);
if (applicationPackage.isPresent()) {
log.log(LogLevel.DEBUG, "Detected permanent application package in '" +
Defaults.getDefaults().underVespaHome(config.applicationDirectory()) +