From 9bf69bd14da3b92a493f2c00b56f1772bc65abf4 Mon Sep 17 00:00:00 2001 From: nicu marasoiu Date: Fri, 19 Jun 2015 13:46:40 +0300 Subject: [PATCH] do not publish context path when it is null or contains only / and/or whitespace chars --- .../cloud/consul/discovery/ConsulLifecycle.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java index 80378e03..d03aa928 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java @@ -18,6 +18,7 @@ package org.springframework.cloud.consul.discovery; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.discovery.AbstractDiscoveryLifecycle; @@ -130,7 +131,9 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle { private List createTags() { List tags = new LinkedList<>(properties.getTags()); - if(servletContext != null) { + if(servletContext != null + && StringUtils.isNotBlank(servletContext.getContextPath()) + && StringUtils.isNotBlank(servletContext.getContextPath().replaceAll("/", ""))) { tags.add("contextPath=" + servletContext.getContextPath()); } return tags;