From f0c216d9d55455573aceab0edbdd9624f0e3a577 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Wed, 26 Sep 2018 06:01:42 +0200
Subject: [PATCH] Improve support for Hazelcast client-server topology

See: #1130
---
 .../session/hazelcast/SessionUpdateEntryProcessor.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-session/src/main/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessor.java b/spring-session/src/main/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessor.java
index c908e5ba..b72c50ee 100644
--- a/spring-session/src/main/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessor.java
+++ b/spring-session/src/main/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessor.java
@@ -34,8 +34,12 @@ class SessionUpdateEntryProcessor extends AbstractEntryProcessor<String, MapSess
 
 	private long lastAccessedTime;
 
+	private boolean lastAccessedTimeSet;
+
 	private int maxInactiveInterval;
 
+	private boolean maxInactiveIntervalSet;
+
 	private Map<String, Object> delta;
 
 	public Object process(Map.Entry<String, MapSession> entry) {
@@ -43,10 +47,10 @@ class SessionUpdateEntryProcessor extends AbstractEntryProcessor<String, MapSess
 		if (value == null) {
 			return Boolean.FALSE;
 		}
-		if (this.lastAccessedTime > 0) {
+		if (this.lastAccessedTimeSet) {
 			value.setLastAccessedTime(this.lastAccessedTime);
 		}
-		if (this.maxInactiveInterval > 0) {
+		if (this.maxInactiveIntervalSet) {
 			value.setMaxInactiveIntervalInSeconds(this.maxInactiveInterval);
 		}
 		if (this.delta != null) {
@@ -65,10 +69,12 @@ class SessionUpdateEntryProcessor extends AbstractEntryProcessor<String, MapSess
 
 	void setLastAccessedTime(long lastAccessedTime) {
 		this.lastAccessedTime = lastAccessedTime;
+		this.lastAccessedTimeSet = true;
 	}
 
 	void setMaxInactiveInterval(int maxInactiveInterval) {
 		this.maxInactiveInterval = maxInactiveInterval;
+		this.maxInactiveIntervalSet = true;
 	}
 
 	void setDelta(Map<String, Object> delta) {