SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from jmirc/master

Browse Source 
Throw an exception when sub folders are creating under the context
This commit is contained in:
Spencer Gibb
2015-06-22 12:04:11 -04:00
parent 2a019eccc3 caba0f37da
commit d127411416
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java
View File

@@ -22,12 +22,11 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.springframework.core.env.EnumerablePropertySource;
import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.QueryParams;
import com.ecwid.consul.v1.Response;
import com.ecwid.consul.v1.kv.model.GetValue;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.util.StringUtils;
/**
@@ -55,9 +54,10 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
if (values != null) {
for (GetValue getValue : values) {
String key = getValue.getKey().replace(context, "").replace('/', '.');
String value = getDecoded(getValue.getValue());
if (StringUtils.hasText(key)) {
String key = getValue.getKey();
if (!StringUtils.endsWithIgnoreCase(key, "/")) {
key = key.replace(context, "").replace('/', '.');
String value = getDecoded(getValue.getValue());
properties.put(key, value);
}
}