HHH-18218 - Fix possible null pointer

mbellade · mbellade · commit 66c5bd5dc227 · 2024-06-12T16:15:29.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java
@@ -47,8 +47,8 @@ public RowTransformerConstructorImpl(Class<T> type, TupleMetadata tupleMetadata)
 
 	private static Class<?> resolveElementJavaType(TupleElement<?> element) {
 		if ( element instanceof SqmExpressibleAccessor ) {
-			SqmExpressible expressible = ( (SqmExpressibleAccessor) element ).getExpressible();
-			if ( expressible != null ) {
+			final SqmExpressible<?> expressible = ( (SqmExpressibleAccessor<?>) element ).getExpressible();
+			if ( expressible != null && expressible.getExpressibleJavaType() != null ) {
 				return expressible.getExpressibleJavaType().getJavaTypeClass();
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public RowTransformerConstructorImpl(Class<T> type, TupleMetadata tupleMetadata)`
`47`	`47`
`48`	`48`	`private static Class<?> resolveElementJavaType(TupleElement<?> element) {`
`49`	`49`	`if ( element instanceof SqmExpressibleAccessor ) {`
`50`		`- SqmExpressible expressible = ( (SqmExpressibleAccessor) element ).getExpressible();`
`51`		`- if ( expressible != null ) {`
	`50`	`+ final SqmExpressible<?> expressible = ( (SqmExpressibleAccessor<?>) element ).getExpressible();`
	`51`	`+ if ( expressible != null && expressible.getExpressibleJavaType() != null ) {`
`52`	`52`	`return expressible.getExpressibleJavaType().getJavaTypeClass();`
`53`	`53`	`}`
`54`	`54`	`}`