From 31ce0b11407e8aca8c860fdcee8e04264a56aa1b Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 12 Dec 2016 09:25:51 -0700 Subject: [PATCH] better utilize File Resource --- .../config/monitor/FileMonitorConfiguration.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java index 33afb6a2..20fb5393 100644 --- a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java +++ b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java @@ -39,6 +39,7 @@ import org.springframework.cloud.config.server.environment.NativeEnvironmentRepo import org.springframework.context.ResourceLoaderAware; import org.springframework.context.SmartLifecycle; import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.http.HttpHeaders; @@ -182,11 +183,13 @@ public class FileMonitorConfiguration implements SmartLifecycle, ResourceLoaderA } private Set getFileRepo() { - if (this.scmRepository != null - && this.scmRepository.getUri().startsWith("file:")) { + if (this.scmRepository != null) { try { - return Collections.singleton(Paths.get(this.resourceLoader - .getResource(this.scmRepository.getUri()).getURI())); + + Resource resource = this.resourceLoader.getResource(this.scmRepository.getUri()); + if (resource instanceof FileSystemResource) { + return Collections.singleton(Paths.get(resource.getURI())); + } } catch (IOException e) { log.error("Cannot resolve URI for path: " + this.scmRepository.getUri());