File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -344,7 +344,7 @@ object BigDecimal {
344
344
implicit def double2bigDecimal (d : Double ): BigDecimal = decimal(d)
345
345
346
346
/** 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)
348
348
}
349
349
350
350
/**
Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ object BigInt {
105
105
106
106
/** Implicit conversion from `java.math.BigInteger` to `scala.BigInt`.
107
107
*/
108
- implicit def javaBigInteger2bigInt (x : BigInteger ): BigInt = apply(x)
108
+ implicit def javaBigInteger2bigInt (x : BigInteger ): BigInt = if (x eq null ) null else apply(x)
109
109
}
110
110
111
111
/**
You can’t perform that action at this time.
0 commit comments