Use getOrElse in MapVal.get

This commit is contained in:
Ilya Gorbunov
2015-06-20 00:13:52 +03:00
parent a6b7857d57
commit 9c7992abbb
@@ -208,11 +208,7 @@ public abstract class MapVal<T, K, out V>() : ReadOnlyProperty<T, V> {
public override fun get(thisRef: T, property: PropertyMetadata) : V {
val map = map(thisRef)
val key = key(property)
if (!map.containsKey(key)) {
return default(thisRef, property)
}
return map[key] as V
return map.getOrElse(key, { default(thisRef, property) }) as V
}
}