Lack of mapcache/ dir causes tests to fail

SignalK · May 8, 2017 · f06629e · f06629e
1 parent 2f33e78
commit f06629e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/nz/co/fortytwo/signalk/server/RouteManager.java b/src/main/java/nz/co/fortytwo/signalk/server/RouteManager.java
@@ -455,8 +455,13 @@ public void configure0() throws Exception {
 	}
 
 	private void reloadCharts() {
-		File mapDir = new File(Util.getConfigProperty(STATIC_DIR)+Util.getConfigProperty(MAP_DIR));
+		String staticDir = Util.getConfigProperty(STATIC_DIR);
+		if(!staticDir.endsWith("/")){
+			staticDir=staticDir+"/";
+		}
+		File mapDir = new File(staticDir+Util.getConfigProperty(MAP_DIR));
 		logger.debug("Reloading charts from: "+mapDir.getAbsolutePath());
+		if(mapDir==null || !mapDir.exists() || mapDir.listFiles()==null)return;
 		UploadProcessor processor = new UploadProcessor();
 		for(File chart:mapDir.listFiles()){
 			if(chart.isDirectory()){