Skip to content

Commit 6cbe502

Browse files
cahilltrguizmaii
authored andcommitted
Fixes implicit javaBigDecimal2bigDecimal to return null, when a null is used by the implicit
Backports scala/scala#9221 to Scala 2.12
1 parent 10f6889 commit 6cbe502

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

library/src/scala/math/BigDecimal.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ object BigDecimal {
344344
implicit def double2bigDecimal(d: Double): BigDecimal = decimal(d)
345345

346346
/** Implicit conversion from `java.math.BigDecimal` to `scala.BigDecimal`. */
347-
implicit def javaBigDecimal2bigDecimal(x: BigDec): BigDecimal = apply(x)
347+
implicit def javaBigDecimal2bigDecimal(x: BigDec): BigDecimal = if (x == null) null else apply(x)
348348
}
349349

350350
/**

0 commit comments

Comments
 (0)