1. Include sessionInMemory update in sessionDAO.doUpdate

2. Add sessionInMemoryEnabled to turn on/off sessionInMemory

Author: CodePlato3721

README.md

@@ -318,6 +318,7 @@ These 4 Serializers are replaceable:
 | expire             | `-2`                 | Redis cache key/value expire time. The expire time is in second.<br>Special values:<br>`-1`: no expire<br>`-2`: the same timeout with session<br>Default value: `-2`<br>**Note**: Make sure expire time is longer than session timeout. |
 | keyPrefix          | `shiro:session:`     | Custom your redis key prefix for session management<br>**Note**: Remember to add colon at the end of prefix. |
 | sessionInMemoryTimeout | `1000`           | When we do signin, `doReadSession(sessionId)` will be called by shiro about 10 times. So shiro-redis save Session in ThreadLocal to remit this problem. sessionInMemoryTimeout is expiration of Session in ThreadLocal. <br>Most of time, you don't need to change it. |
+| sessionInMemoryEnabled | `true`           | Whether or not enable temporary save session in ThreadLocal      |
 | keySerializer        | `org.crazycake.shiro.serializer.StringSerializer` | The key serializer of cache manager<br>You can change the implement of key serializer or the encoding of StringSerializer.<br>Supported encodings refer to [Supported Encodings](https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html). Such as `UTF-8`, `UTF-16`, `UTF-32`, `ISO-8859-1`, `GBK`, `Big5`, etc<br>For more detail, check [Serializer](#serializer) |
 | valueSerializer      | `org.crazycake.shiro.serializer.ObjectSerializer` | The value serializer of cache manager<br>You can change the implement of value serializer<br>For more detail, check [Serializer](#serializer) |
 
@@ -421,6 +422,7 @@ For full example, see [shiro-redis-spring-boot-tutorial](https://github.com/alex
 | shiro-redis.session-dao.expire                     | `-2`                 | Redis cache key/value expire time. The expire time is in second.<br>Special values:<br>`-1`: no expire<br>`-2`: the same timeout with session<br>Default value: `-2`<br>**Note**: Make sure expire time is longer than session timeout. |
 | shiro-redis.session-dao.key-prefix                 | `shiro:session:`     | Custom your redis key prefix for session management<br>**Note**: Remember to add colon at the end of prefix. |
 | shiro-redis.session-dao.session-in-memory-timeout  | `1000`           | When we do signin, `doReadSession(sessionId)` will be called by shiro about 10 times. So shiro-redis save Session in ThreadLocal to remit this problem. sessionInMemoryTimeout is expiration of Session in ThreadLocal. <br>Most of time, you don't need to change it. |
+| shiro-redis.session-dao.session-in-memory-enabled  | `true`           | Whether or not enable temporary save session in ThreadLocal      |
 | shiro-redis.cache-manager.principal-id-field-name  | `id`                 | Principal id field name. The field which you can get unique id to identify this principal.<br>For example, if you use UserInfo as Principal class, the id field maybe `id`, `userId`, `email`, etc.<br>Remember to add getter to this id field. For example, `getId()`, `getUserId(`), `getEmail()`, etc.<br>Default value is `id`, that means your principal object must has a method called `getId()` |
 | shiro-redis.cache-manager.expire                   | `1800`               | Redis cache key/value expire time. <br>The expire time is in second. |
 | shiro-redis.cache-manager.key-prefix               | `shiro:cache:`       | Custom your redis key prefix for cache management<br>**Note**: Remember to add colon at the end of prefix. |

src/main/java/org/crazycake/shiro/RedisSessionDAO.java

@@ -29,6 +29,10 @@ public class RedisSessionDAO extends AbstractSessionDAO {
 	 */
 	private long sessionInMemoryTimeout = DEFAULT_SESSION_IN_MEMORY_TIMEOUT;
 
+	private static final boolean DEFAULT_SESSION_IN_MEMORY_ENABLED = true;
+
+	private boolean sessionInMemoryEnabled = DEFAULT_SESSION_IN_MEMORY_ENABLED;
+
 	// expire time in seconds
 	private static final int DEFAULT_EXPIRE = -2;
 	private static final int NO_EXPIRE = -1;
@@ -48,6 +52,9 @@ public class RedisSessionDAO extends AbstractSessionDAO {
 	@Override
 	public void update(Session session) throws UnknownSessionException {
 		this.saveSession(session);
+		if (this.sessionInMemoryEnabled) {
+			this.setSessionToThreadLocal(session.getId(), session);
+		}
 	}
 
 	/**
@@ -131,20 +138,24 @@ protected Session doReadSession(Serializable sessionId) {
 			logger.warn("session id is null");
 			return null;
 		}
-		Session s = getSessionFromThreadLocal(sessionId);
-
-		if (s != null) {
-			return s;
+			if (this.sessionInMemoryEnabled) {
+			Session session = getSessionFromThreadLocal(sessionId);
+			if (session != null) {
+				return session;
+			}
 		}
 
+		Session session = null;
 		logger.debug("read session from redis");
 		try {
-			s = (Session) valueSerializer.deserialize(redisManager.get(keySerializer.serialize(getRedisSessionKey(sessionId))));
-			setSessionToThreadLocal(sessionId, s);
+			session = (Session) valueSerializer.deserialize(redisManager.get(keySerializer.serialize(getRedisSessionKey(sessionId))));
+			if (this.sessionInMemoryEnabled) {
+				setSessionToThreadLocal(sessionId, session);
+			}
 		} catch (SerializationException e) {
 			logger.error("read session error. settionId=" + sessionId);
 		}
-		return s;
+		return session;
 	}
 
 	private void setSessionToThreadLocal(Serializable sessionId, Session s) {
@@ -234,4 +245,12 @@ public int getExpire() {
 	public void setExpire(int expire) {
 		this.expire = expire;
 	}
+
+	public boolean getSessionInMemoryEnabled() {
+		return sessionInMemoryEnabled;
+	}
+
+	public void setSessionInMemoryEnabled(boolean sessionInMemoryEnabled) {
+		this.sessionInMemoryEnabled = sessionInMemoryEnabled;
+	}
 }

src/test/java/org/crazycake/shiro/RedisSessionDAOTest.java

@@ -86,6 +86,18 @@ public void testUpdateEmptySession() {
     @Test
     public void testUpdate() {
         redisSessionDAO.doCreate(session1);
+        redisSessionDAO.doReadSession(session1.getId());
+        doChangeSessionName(session1, name1);
+        redisSessionDAO.update(session1);
+        FakeSession actualSession = (FakeSession)redisSessionDAO.doReadSession(session1.getId());
+        assertEquals(actualSession.getName(), name1);
+    }
+
+    @Test
+    public void testUpdateWithoutSessionInMemory() {
+        redisSessionDAO.setSessionInMemoryEnabled(false);
+        redisSessionDAO.doCreate(session1);
+        redisSessionDAO.doReadSession(session1.getId());
         doChangeSessionName(session1, name1);
         redisSessionDAO.update(session1);
         FakeSession actualSession = (FakeSession)redisSessionDAO.doReadSession(session1.getId());