aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-03-21 11:34:57 +0100
committergjoranv <gv@verizonmedia.com>2019-03-21 11:34:57 +0100
commitca63524eb382e1e3fd92a78799eb4b2db0fa927a (patch)
tree191da8e83b1f4e08d0f096568a144fdb3579cbbf
parent573e322c1ac89e4c8b9f5a7f9e9784c23db2a2f0 (diff)
Check for null 'http'
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/Container.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 8e0a06ad69c..74fcd57aa4d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -170,7 +170,7 @@ public abstract class Container extends AbstractService implements
}
private void reserveHttpPortsPrepended() {
- if (getHttp().getHttpServer() != null) {
+ if (getHttp() != null && getHttp().getHttpServer() != null) {
for (ConnectorFactory connectorFactory : getHttp().getHttpServer().getConnectorFactories()) {
reservePortPrepended(getPort(connectorFactory), "http/" + connectorFactory.getName());
}