From eb67c2fe5ae6a8599569f9ad9cbc6dd1738029a8 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 8 Dec 2015 16:28:12 +0000 Subject: [PATCH] Fix error in plaveholder for timeout --- .../org/springframework/cloud/util/InetUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java index 5de543b8..ecdfd263 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/util/InetUtils.java @@ -91,9 +91,15 @@ public class InetUtils { String hostname; try { - SystemPropertyUtils.resolvePlaceholders( - "${spring.util.timeout.sec:${SPRING_UTIL_TIMEOUT_SEC:1}"); - hostname = result.get(1, TimeUnit.SECONDS); + String value = SystemPropertyUtils.resolvePlaceholders( + "${spring.util.timeout.sec:${SPRING_UTIL_TIMEOUT_SEC:1}}"); + int timeout = 1; + try { + timeout = Integer.valueOf(value); + } + catch (NumberFormatException e) { + } + hostname = result.get(timeout, TimeUnit.SECONDS); } catch (Exception e) { log.info("Cannot determine local hostname");