From b5197b8665cbd3810361a3fb7e1ca9a50015ddc6 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran@vedranpavic.com>
Date: Tue, 27 Sep 2022 18:43:14 +0200
Subject: [PATCH] Polish RedisIndexedSessionRepository

This commit addresses code warnings due to nullability of return values.
---
 .../session/data/redis/RedisIndexedSessionRepository.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
index 89083294..3c03beb0 100644
--- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
+++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
@@ -480,6 +480,9 @@ public class RedisIndexedSessionRepository
 		}
 		String principalKey = getPrincipalKey(indexValue);
 		Set<Object> sessionIds = this.sessionRedisOperations.boundSetOps(principalKey).members();
+		if (sessionIds == null) {
+			return Collections.emptyMap();
+		}
 		Map<String, RedisSession> sessions = new HashMap<>(sessionIds.size());
 		for (Object id : sessionIds) {
 			RedisSession session = findById((String) id);
@@ -499,7 +502,7 @@ public class RedisIndexedSessionRepository
 	 */
 	private RedisSession getSession(String id, boolean allowExpired) {
 		Map<String, Object> entries = getSessionBoundHashOperations(id).entries();
-		if (entries.isEmpty()) {
+		if ((entries == null) || entries.isEmpty()) {
 			return null;
 		}
 		MapSession loaded = new RedisSessionMapper(id).apply(entries);