Skip to content
Snippets Groups Projects
Commit 667f417f authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

no merging when map is still empty

parent 27de6356
No related branches found
No related tags found
No related merge requests found
......@@ -38,7 +38,8 @@ class Config(var map: Map[String,Any]) extends Logging {
configJson.get match {
case m:Map[_,_] => {
returnMap = Config.valueToMap(configJson.get)
map = Config.mergeMaps(returnMap, map)
if (map.isEmpty) returnMap = map
else map = Config.mergeMaps(returnMap, map)
}
case null => logger.warn("Config " + configFile + " wrong format")
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment