summaryrefslogtreecommitdiffstats
path: root/athenz-identity-provider-service
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2017-11-03 09:00:36 +0100
committerValerij Fredriksen <valerijf@oath.com>2017-11-03 09:00:36 +0100
commit03e895730cea1257941f4790438dc347571d9d65 (patch)
treed5315bb08ca243e85364aed31bb95dd838e6bffa /athenz-identity-provider-service
parentbaf0f7b4be6716a930974e16f0764f997a5d67e1 (diff)
Code review fixes
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/InstanceValidator.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/InstanceValidator.java
index 01a88cbcfcf..427f35c41d8 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/InstanceValidator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/InstanceValidator.java
@@ -100,12 +100,12 @@ public class InstanceValidator {
String domainInConfig = matchingServiceInfo.get().getProperty(SERVICE_PROPERTIES_DOMAIN_KEY).get();
String serviceInConfig = matchingServiceInfo.get().getProperty(SERVICE_PROPERTIES_SERVICE_KEY).get();
- if (domainInConfig.equals(domain) && serviceInConfig.equals(service)) {
- return true;
- } else {
- log.info(String.format("domain '%s' or service '%s' does not match the one in config for application %s",
+ if (!domainInConfig.equals(domain) || !serviceInConfig.equals(service)) {
+ log.warning(String.format("domain '%s' or service '%s' does not match the one in config for application %s",
domain, service, applicationId.serializedForm()));
return false;
}
+
+ return true;
}
}