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");