Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

roll back breakage to DurationJavaType 

see the comment in the code
This commit is contained in:
Gavin King 2022-03-29 21:18:26 +02:00 committed by Christian Beikov
parent 6d55b9b2a4
commit 7d9eada83e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
View File

@ -37,7 +37,7 @@ public class DurationJavaType extends AbstractClassJavaType<Duration> {
* Singleton access * Singleton access
*/ */
public static final DurationJavaType INSTANCE = new DurationJavaType(); public static final DurationJavaType INSTANCE = new DurationJavaType();
private static final BigDecimal BILLION = BigDecimal.valueOf( 1_000_000_000 ); private static final BigDecimal BILLION = BigDecimal.ONE.movePointRight(9);
public DurationJavaType() { public DurationJavaType() {
super( Duration.class, ImmutableMutabilityPlan.instance() ); super( Duration.class, ImmutableMutabilityPlan.instance() );
@ -113,10 +113,14 @@ public class DurationJavaType extends AbstractClassJavaType<Duration> {
if (value instanceof BigDecimal) { if (value instanceof BigDecimal) {
final BigDecimal decimal = (BigDecimal) value; final BigDecimal decimal = (BigDecimal) value;
final BigDecimal[] bigDecimals = decimal.divideAndRemainder( BILLION ); final BigDecimal[] secondsAndNanos = decimal.divideAndRemainder( BILLION );
return Duration.ofSeconds( return Duration.ofSeconds(
bigDecimals[0].longValueExact(), secondsAndNanos[0].longValueExact(),
bigDecimals[1].longValueExact() // use intValue() not intValueExact() here, because
// the database will sometimes produce garbage digits
// in a floating point multiplication, and we would
// get an unwanted ArithmeticException
secondsAndNanos[1].intValue()
); );
} }