From 59507ee8bcb166b68154595d32595daaa62976ab Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 11 Sep 2020 09:57:37 -0400 Subject: [PATCH] Optimizes isResolvable() only bind with correct prefix. --- .../consul/config/ConsulConfigDataLocationResolver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java index 0a97667d..22be2ae9 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java @@ -58,12 +58,16 @@ public class ConsulConfigDataLocationResolver @Override public boolean isResolvable(ConfigDataLocationResolverContext context, String location) { + if (!location.startsWith(PREFIX)) { + return false; + } + // only bind if correct prefix boolean enabled = context.getBinder() .bind(ConsulProperties.PREFIX + ".enabled", Boolean.class).orElse(true); boolean configEnabled = context.getBinder() .bind(ConsulConfigProperties.PREFIX + ".enabled", Boolean.class) .orElse(true); - return location.startsWith(PREFIX) && configEnabled && enabled; + return configEnabled && enabled; } @Override