From 055bc069655172ceec1dd1ce7deca426391d3def Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 11 Sep 2020 09:57:56 -0400 Subject: [PATCH] Optimizes isResolvable() only bind with correct prefix. --- .../config/ZookeeperConfigDataLocationResolver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java index c736e983..79fadd18 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java @@ -54,11 +54,15 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe @Override public boolean isResolvable(ConfigDataLocationResolverContext context, String location) { + if (!location.startsWith(PREFIX)) { + return false; + } + // only bind on correct prefix boolean zkEnabled = context.getBinder().bind(ZookeeperProperties.PREFIX + ".enabled", Boolean.class) .orElse(true); boolean zkConfigEnabled = context.getBinder().bind(ZookeeperConfigProperties.PREFIX + ".enabled", Boolean.class) .orElse(true); - return location.startsWith(PREFIX) && zkConfigEnabled && zkEnabled; + return zkConfigEnabled && zkEnabled; } @Override