From 0d41765c2ba169824849916ada05c675b5be5037 Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Thu, 23 Jul 2015 10:43:12 +0200
Subject: [PATCH] Fix bug for #181
---
.../src/main/scala/nl/lumc/sasc/biopet/utils/ConfigUtils.scala | 2 +-
.../test/scala/nl/lumc/sasc/biopet/utils/ConfigUtilsTest.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/utils/ConfigUtils.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/utils/ConfigUtils.scala
index 31fff9a1e..31f807061 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/utils/ConfigUtils.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/utils/ConfigUtils.scala
@@ -46,7 +46,7 @@ object ConfigUtils extends Logging {
map1(key) match {
case m1: Map[_, _] =>
map2(key) match {
- case m2: Map[_, _] => newMap += (key -> mergeMaps(any2map(m1), any2map(m2)))
+ case m2: Map[_, _] => newMap += (key -> mergeMaps(any2map(m1), any2map(m2), resolveConflict))
case _ => newMap += (key -> map1(key))
}
case _ => newMap += (key -> resolveConflict(map1(key), map2(key), key))
diff --git a/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/utils/ConfigUtilsTest.scala b/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/utils/ConfigUtilsTest.scala
index 4dbb1daec..571e9d62f 100644
--- a/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/utils/ConfigUtilsTest.scala
+++ b/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/utils/ConfigUtilsTest.scala
@@ -217,7 +217,7 @@ class ConfigUtilsTest extends TestNGSuite with Matchers {
@Test def testNestedMergeConflict: Unit = {
val map1 = Map("c" -> Map("x" -> "1"))
- val map2 = Map("c" -> Map("x" -> "1"))
+ val map2 = Map("c" -> Map("x" -> "2"))
mergeMaps(map1, map2) shouldBe Map("c" -> Map("x" -> "1"))
mergeMaps(map1, map2, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> Map("x" -> "12"))
mergeMaps(map2, map1, (a, b, k) => a.toString + b.toString) shouldBe Map("c" -> Map("x" -> "21"))
--
GitLab