fixes

akka-js · Apr 27, 2018 · 1895517 · 1895517
1 parent 803621e
commit 1895517
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/facade/shared/src/main/scala/com/typesafe/config/Config.scala b/facade/shared/src/main/scala/com/typesafe/config/Config.scala
@@ -46,9 +46,9 @@ object ConfigFactory {
   def empty() = Config(shocon.Config.gen("{}"))
 
   def parseMap(values: java.util.Map[String, Any]) =
-    shocon.Config.Object(values.asScala.map{
+    Config(shocon.Config.Object.fromPairs(values.asScala.map{
       case (k, v) => k -> shocon.Config.StringLiteral(v.toString)
-    }.toMap)
+    }.toSeq))
     // to be verified ...
     // parseString(values.asScala.map{ case (k, v) => s"$k=$v"}.mkString("\n"))
 

diff --git a/shared/src/main/scala/eu/unicredit/shocon/SHocon.scala b/shared/src/main/scala/eu/unicredit/shocon/SHocon.scala
@@ -128,7 +128,9 @@ package object shocon extends Extractors {
         case o@Config.Object(fields) =>
             if (fields.contains(keys.head))
               visit(fields(keys.head), keys.tail)
-            else None
+            else {
+              None
+            }
       }
       visit(tree, keys)
     }