Added missing null check for metadata.

schauder · schauder · commit 393fa635bd4e · 2023-04-18T10:25:14.000+02:00
See #2716 Closes #2897
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -309,7 +309,7 @@ public Optional<T> findById(ID id) {
 
 		getQueryHints().withFetchGraphs(em).forEach(hints::put);
 
-		if (metadata.getComment() != null && provider.getCommentHintKey() != null) {
+		if (metadata != null && metadata.getComment() != null && provider.getCommentHintKey() != null) {
 			hints.put(provider.getCommentHintKey(), provider.getCommentHintValue(metadata.getComment()));
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public Optional<T> findById(ID id) {`
`309`	`309`
`310`	`310`	`getQueryHints().withFetchGraphs(em).forEach(hints::put);`
`311`	`311`
`312`		`- if (metadata.getComment() != null && provider.getCommentHintKey() != null) {`
	`312`	`+ if (metadata != null && metadata.getComment() != null && provider.getCommentHintKey() != null) {`
`313`	`313`	`hints.put(provider.getCommentHintKey(), provider.getCommentHintValue(metadata.getComment()));`
`314`	`314`	`}`
`315`	`315`