diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2016-11-03 19:15:12 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahoo-inc.com> | 2016-11-03 19:15:12 +0100 |
| commit | cc27c1d1bce4ddf5820801c94332487b33835f3a (patch) | |
| tree | 8a32d2a3c51fd64b22d1ff11fe214b8b889701f1 /configserver | |
| parent | cefdf344578723f0a55b464d962cba3c4f560e27 (diff) | |
Use preprocessed application package to check for nodes with type spec
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index f28af8939bc..5ee9970e01a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -234,8 +234,11 @@ public class Deployment implements com.yahoo.config.provision.Deployment { // Precondition: session is for a hosted routing application boolean isHostedRoutingApplicationUsingRoutingNodesInNodeRepo(LocalSession session) { - Path servicesPath = Path.fromString(ApplicationPackage.SERVICES); + Path servicesPath = Path.fromString("'.preprocessed/" + ApplicationPackage.SERVICES); ApplicationFile services = session.getApplicationFile(servicesPath, LocalSession.Mode.READ); + + if ( ! services.exists()) return false; + try { return usesRoutingNodesInNodeRepo(services.createReader()); } catch (FileNotFoundException e) { |