From b0aa2b67546698fefc4218393ea9eebc01524c69 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Mon, 5 Dec 2022 12:28:31 -0600
Subject: [PATCH] Add additional null checks when applying hints.

It's possible to apply hints and hit a NullPointerException.

Resolves #2716.
---
 .../data/jpa/repository/support/SimpleJpaRepository.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

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 5e1662dba..17abebbd3 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
@@ -832,6 +832,10 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 
 	private void applyQueryHints(Query query) {
 
+		if (metadata == null) {
+			return;
+		}
+
 		getQueryHints().withFetchGraphs(em).forEach(query::setHint);
 
 		if (metadata.getComment() != null && provider.getCommentHintKey() != null) {
@@ -852,6 +856,10 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 
 	private void applyQueryHintsForCount(Query query) {
 
+		if (metadata == null) {
+			return;
+		}
+
 		getQueryHintsForCount().forEach(query::setHint);
 
 		if (metadata.getComment() != null && provider.getCommentHintKey() != null) {