From 667f417f32891dce4e35aafb2fbe62a40e7351bd Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Thu, 19 Jun 2014 10:39:56 +0200
Subject: [PATCH] no merging when map is still empty
---
.../src/main/scala/nl/lumc/sasc/biopet/core/Config.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/Config.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/Config.scala
index 00316a09c..934c97a5f 100644
--- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/Config.scala
+++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/Config.scala
@@ -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")
}
--
GitLab