From fcd0feb61ef915f829ccfe5ae398e930865cdf43 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 4 Apr 2016 16:59:44 +0100 Subject: [PATCH] Ensure whitespace is stripped from appConfig in turbine Fixes gh-948 --- .../cloud/netflix/turbine/TurbineProperties.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java index e2c2eb37..6db68eac 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java @@ -19,11 +19,11 @@ package org.springframework.cloud.netflix.turbine; import java.util.Arrays; import java.util.List; -import lombok.Data; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.StringUtils; +import lombok.Data; + /** * @author Spencer Gibb */ @@ -38,11 +38,12 @@ public class TurbineProperties { private boolean combineHostPort = false; public List getAppConfigList() { - if (!StringUtils.hasText(appConfig)) { + if (!StringUtils.hasText(this.appConfig)) { return null; } - String[] parts = appConfig.trim().split(","); + String[] parts = StringUtils.commaDelimitedListToStringArray(this.appConfig); if (parts != null && parts.length > 0) { + parts = StringUtils.trimArrayElements(parts); return Arrays.asList(parts); } return null;