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

Fixed default values

parent ca9c7e5c
No related branches found
No related tags found
No related merge requests found
......@@ -39,10 +39,10 @@ trait Configurable extends ImplicitConversions {
def defaults: Map[String, Any] = Map()
/** This method merge defaults from the root to it's own */
protected def internalDefaults: Map[String, Any] = {
protected[config] def internalDefaults: Map[String, Any] = {
(root != null, defaults.isEmpty) match {
case (true, true) => root.defaults
case (true, false) => ConfigUtils.mergeMaps(defaults, root.defaults)
case (true, true) => root.internalDefaults
case (true, false) => ConfigUtils.mergeMaps(defaults, root.internalDefaults)
case (false, true) => globalConfig.defaults
case (false, false) => ConfigUtils.mergeMaps(defaults, globalConfig.defaults)
}
......
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