From 57955b7d7b8b672a3ce73cb41ec089e791c5f808 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Mon, 10 Sep 2018 17:02:33 +0200 Subject: [PATCH] Polish See gh-1111 --- .../redis/ReactiveRedisOperationsSessionRepository.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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()); }