From 656a1bd75d2fa2f8e29433c665aa89c577c85eb8 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 15 Aug 2016 15:42:54 +0100 Subject: [PATCH] Ensure config files have / prefixes --- .../cloud/launcher/deployer/DeployerThread.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java index 7f71271..d5a1ebe 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java @@ -136,14 +136,14 @@ public class DeployerThread extends Thread { private PropertySource extractPropertySource(String path) { PropertySource source = null; - Resource resource = new ClassPathResource("config/" + path, DeployerThread.class); + Resource resource = new ClassPathResource("config" + path, DeployerThread.class); source = loadPropertySource(resource, path); if (source==null) { resource = new ClassPathResource(path, DeployerThread.class); source = loadPropertySource(resource, path); } if (source==null) { - resource = new FileSystemResource("config/" + path); + resource = new FileSystemResource("config" + path); source = loadPropertySource(resource, path); } if (source==null) { @@ -257,7 +257,7 @@ public class DeployerThread extends Thread { if (!shouldDeploy("eureka", properties)) { appDefProps.put("eureka.client.enabled", Boolean.FALSE.toString()); } - Map map = extractProperties(deployable.getName() + ".yml"); + Map map = extractProperties("/" + deployable.getName() + ".yml"); for (String key : map.keySet()) { appDefProps.put(key, map.get(key)); }