HHH-20209 Ensure JavaTypeRegistry#resolveDescriptor always returns same instance

beikov · beikov · commit 2a63b4cfe0bc · 2026-03-26T18:54:27.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
@@ -106,8 +106,9 @@ public <J> JavaType<J> resolveDescriptor(Type javaType, Supplier<JavaType<J>> cr
 		}
 
 		final JavaType<J> created = creator.get();
-		descriptorsByType.put( javaType, created );
-		return created;
+		final JavaType<?> cachedNew = descriptorsByType.putIfAbsent( javaType, created );
+		//noinspection unchecked
+		return cachedNew == null ? created : (JavaType<J>) cachedNew;
 	}
 
 	public <J> JavaType<J> resolveDescriptor(Type javaType) {

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,9 @@ public <J> JavaType<J> resolveDescriptor(Type javaType, Supplier<JavaType<J>> cr`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`final JavaType<J> created = creator.get();`
`109`		`- descriptorsByType.put( javaType, created );`
`110`		`- return created;`
	`109`	`+ final JavaType<?> cachedNew = descriptorsByType.putIfAbsent( javaType, created );`
	`110`	`+ //noinspection unchecked`
	`111`	`+ return cachedNew == null ? created : (JavaType<J>) cachedNew;`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`public <J> JavaType<J> resolveDescriptor(Type javaType) {`