From 393fa635bd4ecf71a5aa4af951c2acbb898290de Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@vmware.com>
Date: Tue, 18 Apr 2023 10:25:14 +0200
Subject: [PATCH] Added missing null check for metadata.

See #2716
Closes #2897
---
 .../data/jpa/repository/support/SimpleJpaRepository.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 5358af188..e537c9537 100644
--- 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 class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 
 		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()));
 		}