Added missing null check for metadata.

schauder · schauder · commit 0348c680d10c · 2023-04-18T10:29:04.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
@@ -304,7 +304,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
`@@ -304,7 +304,7 @@ public Optional<T> findById(ID id) {`
`304`	`304`
`305`	`305`	`getQueryHints().withFetchGraphs(em).forEach(hints::put);`
`306`	`306`
`307`		`- if (metadata.getComment() != null && provider.getCommentHintKey() != null) {`
	`307`	`+ if (metadata != null && metadata.getComment() != null && provider.getCommentHintKey() != null) {`
`308`	`308`	`hints.put(provider.getCommentHintKey(), provider.getCommentHintValue(metadata.getComment()));`
`309`	`309`	`}`
`310`	`310`