diff options
| author | gjoranv <gjoranv@gmail.com> | 2019-03-22 10:29:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 10:29:33 +0100 |
| commit | 46929cb27005d49f0d37196967f62fbbab8a00c8 (patch) | |
| tree | 0002ab64933ef1f62f0f58803c1de467ecd29fa9 /config-model | |
| parent | 519d59334ca8c3e314e71f83de618e375a7c2d6c (diff) | |
| parent | ca63524eb382e1e3fd92a78799eb4b2db0fa927a (diff) | |
Merge pull request #8862 from vespa-engine/gjoranv/null-check
Check for null 'http' (MERGEOK)
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 2 |
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()); } |