diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepository.java index 379ed29d..cf8922d9 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepository.java @@ -151,13 +151,10 @@ public class ReactiveRedisOperationsSessionRepository implements if (session.isNew) { return result; } - else if (session.hasChangedSessionId()) { - String sessionKey = getSessionKey(session.originalSessionId); - return this.sessionRedisOperations.hasKey(sessionKey) - .flatMap((exists) -> exists ? result : Mono.empty()); - } else { - String sessionKey = getSessionKey(session.getId()); + String sessionKey = getSessionKey( + session.hasChangedSessionId() ? session.originalSessionId + : session.getId()); return this.sessionRedisOperations.hasKey(sessionKey) .flatMap((exists) -> exists ? result : Mono.empty()); }