MPL-1 mergeMaps will process every value in overlay (#7)

griddynamics · Jun 22, 2018 · ddf014b · ddf014b
1 parent b2f5550
commit ddf014b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/com/griddynamics/devops/mpl/Helper.groovy b/src/com/griddynamics/devops/mpl/Helper.groovy
@@ -92,7 +92,8 @@ abstract class Helper {
    * @return  modified base map
    */
   static Map mergeMaps(Map base, Map overlay) {
-    if( ! overlay ) return base
+    if( ! (base in Map) ) base = [:]
+    if( ! (overlay in Map) ) return overlay
     overlay.each { key, val ->
       base[key] = base[key] in Map ? mergeMaps(base[key], val) : val
     }

diff --git a/src/com/griddynamics/devops/mpl/MPLManager.groovy b/src/com/griddynamics/devops/mpl/MPLManager.groovy
@@ -76,7 +76,7 @@ class MPLManager implements Serializable {
    * @return  Overriden configuration for the specified module
    */
   public Map moduleConfig(String name) {
-    config.modules ? Helper.mergeMaps(config.subMap(config.keySet()-'modules'), config.modules[name]) : [:]
+    config.modules ? Helper.mergeMaps(config.subMap(config.keySet()-'modules'), (config.modules[name] ?: [:])) : [:]
   }
 
   /**