diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-18 11:08:46 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-18 11:08:46 +0100 |
commit | a41f870975382beaa403111db7f7440509a884ad (patch) | |
tree | 6d2ffd2fe88437fc168b59a7c95b10a0e55b395c /config-model | |
parent | 96808803dda3cc863056599b27656a3ee43ebcc7 (diff) |
Fix check for non-identical domains
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index feb82c40ee7..dc74e2afbb1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -95,7 +95,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http> deployState.getDeployLogger().log(Level.WARNING, "Athenz tenant is not provided by deploy call. This will soon be handled as failure."); } if (explicitDomain != null) { - if (explicitDomain.equals(tenantDomain)) { + if (tenantDomain != null && !explicitDomain.equals(tenantDomain)) { throw new IllegalArgumentException( String.format("Domain in access-control ('%s') does not match tenant domain ('%s')", tenantDomain, explicitDomain)); } |