Skip to content

Commit f1228bb

Browse files
authored
Merge pull request scala/scala#10592 from guizmaii/fix_212_javaBigDecimal2bigDecimal
[backport] Fixes implicit `javaBigDecimal2bigDecimal` to return `null`, when a `null` is used by the implicit
2 parents 10f6889 + 0b92994 commit f1228bb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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
/**

library/src/scala/math/BigInt.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object BigInt {
105105

106106
/** Implicit conversion from `java.math.BigInteger` to `scala.BigInt`.
107107
*/
108-
implicit def javaBigInteger2bigInt(x: BigInteger): BigInt = apply(x)
108+
implicit def javaBigInteger2bigInt(x: BigInteger): BigInt = if (x eq null) null else apply(x)
109109
}
110110

111111
/**

0 commit comments

Comments
 (0)