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

HHH-18377 Fix NPE for private static final field

This commit is contained in:
Marco Belladelli 2024-09-24 15:20:31 +02:00
parent ebcbebac39
commit c9621aa9e2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion6Strategy.java
View File

@ -36,15 +36,13 @@ import org.hibernate.id.UUIDGenerationStrategy;
* @author Cedomir Igaly * @author Cedomir Igaly
*/ */
public class UuidVersion6Strategy implements UUIDGenerationStrategy, UuidValueGenerator { public class UuidVersion6Strategy implements UUIDGenerationStrategy, UuidValueGenerator {
public static final UuidVersion6Strategy INSTANCE = new UuidVersion6Strategy(); public static final UuidVersion6Strategy INSTANCE = new UuidVersion6Strategy();
private static final Instant EPOCH_1582 = LocalDate.of( 1582, 10, 15 )
.atStartOfDay( ZoneId.of( "UTC" ) )
.toInstant();
private static class Holder { private static class Holder {
static final SecureRandom numberGenerator = new SecureRandom(); static final SecureRandom numberGenerator = new SecureRandom();
static final Instant EPOCH_1582 = LocalDate.of( 1582, 10, 15 )
.atStartOfDay( ZoneId.of( "UTC" ) )
.toInstant();
} }
private final Lock lock = new ReentrantLock( true ); private final Lock lock = new ReentrantLock( true );
@ -112,7 +110,7 @@ public class UuidVersion6Strategy implements UUIDGenerationStrategy, UuidValueGe
} }
private static long getCurrentTimestamp() { private static long getCurrentTimestamp() {
final Duration duration = Duration.between( EPOCH_1582, Instant.now() ); final Duration duration = Duration.between( Holder.EPOCH_1582, Instant.now() );
return duration.toSeconds() * 10_000_000 + duration.toNanosPart() / 100; return duration.toSeconds() * 10_000_000 + duration.toNanosPart() / 100;
} }
} }