Skip to content

R
redisson

weixin_57962205 / redisson
与 Fork 源项目一致

从无法访问的项目Fork

通知 10
Star 1
Fork 0
R
redisson

体验新版 GitCode，发现更多精彩内容 >>

提交 d8ae21e5 编写于 作者: N Nikita Koksharov
浏览文件
操作

Fixed - ClassNotFoundException is thrown by Tomcat Session Manager in readMode = MEMORY #1959

上级 d5ee9a72
隐藏空白更改
内联 并排
Showing with 56 addition and 24 deletion
redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSession.java
浏览文件 @ d8ae21e5
...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession { ...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession {
public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR, public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR,
THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR)); THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR));
private boolean loaded;
private final RedissonSessionManager redissonManager; private final RedissonSessionManager redissonManager;
private final Map<String, Object> attrs; private final Map<String, Object> attrs;
private RMap<String, Object> map; private RMap<String, Object> map;
...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession { ...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession {
} }
return map.get(name); return map.get(name);
} else {
if (!loaded) {
synchronized (this) {
if (!loaded) {
Map<String, Object> storedAttrs = map.readAllMap();
load(storedAttrs);
loaded = true;
}
}
}
} }
return super.getAttribute(name); return super.getAttribute(name);
......
redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
浏览文件 @ d8ae21e5
...@@ -170,13 +170,9 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle { ...@@ -170,13 +170,9 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
if (id != null) { if (id != null) {
Map<String, Object> attrs = new HashMap<String, Object>(); Map<String, Object> attrs = new HashMap<String, Object>();
try { try {
if (readMode == ReadMode.MEMORY) { attrs = getMap(id).getAll(RedissonSession.ATTRS);
attrs = getMap(id).readAllMap();
} else {
attrs = getMap(id).getAll(RedissonSession.ATTRS);
}
} catch (Exception e) { } catch (Exception e) {
throw new IOException(e); log.error("Can't read session object by id: " + id, e);
} }
RedissonSession session = (RedissonSession) createEmptySession(); RedissonSession session = (RedissonSession) createEmptySession();
......
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java
浏览文件 @ d8ae21e5
...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession { ...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession {
public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR, public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR,
THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR)); THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR));
private boolean loaded;
private final RedissonSessionManager redissonManager; private final RedissonSessionManager redissonManager;
private final Map<String, Object> attrs; private final Map<String, Object> attrs;
private RMap<String, Object> map; private RMap<String, Object> map;
...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession { ...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession {
} }
return map.get(name); return map.get(name);
} else {
if (!loaded) {
synchronized (this) {
if (!loaded) {
Map<String, Object> storedAttrs = map.readAllMap();
load(storedAttrs);
loaded = true;
}
}
}
} }
return super.getAttribute(name); return super.getAttribute(name);
......
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
浏览文件 @ d8ae21e5
...@@ -148,13 +148,9 @@ public class RedissonSessionManager extends ManagerBase { ...@@ -148,13 +148,9 @@ public class RedissonSessionManager extends ManagerBase {
if (id != null) { if (id != null) {
Map<String, Object> attrs = new HashMap<String, Object>(); Map<String, Object> attrs = new HashMap<String, Object>();
try { try {
if (readMode == ReadMode.MEMORY) { attrs = getMap(id).getAll(RedissonSession.ATTRS);
attrs = getMap(id).readAllMap();
} else {
attrs = getMap(id).getAll(RedissonSession.ATTRS);
}
} catch (Exception e) { } catch (Exception e) {
throw new IOException(e); log.error("Can't read session object by id: " + id, e);
} }
RedissonSession session = (RedissonSession) createEmptySession(); RedissonSession session = (RedissonSession) createEmptySession();
......
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java
浏览文件 @ d8ae21e5
...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession { ...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession {
public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR, public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR,
THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR)); THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR));
private boolean loaded;
private final RedissonSessionManager redissonManager; private final RedissonSessionManager redissonManager;
private final Map<String, Object> attrs; private final Map<String, Object> attrs;
private RMap<String, Object> map; private RMap<String, Object> map;
...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession { ...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession {
} }
return map.get(name); return map.get(name);
} else {
if (!loaded) {
synchronized (this) {
if (!loaded) {
Map<String, Object> storedAttrs = map.readAllMap();
load(storedAttrs);
loaded = true;
}
}
}
} }
return super.getAttribute(name); return super.getAttribute(name);
......
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
浏览文件 @ d8ae21e5
...@@ -147,13 +147,9 @@ public class RedissonSessionManager extends ManagerBase { ...@@ -147,13 +147,9 @@ public class RedissonSessionManager extends ManagerBase {
if (id != null) { if (id != null) {
Map<String, Object> attrs = new HashMap<String, Object>(); Map<String, Object> attrs = new HashMap<String, Object>();
try { try {
if (readMode == ReadMode.MEMORY) { attrs = getMap(id).getAll(RedissonSession.ATTRS);
attrs = getMap(id).readAllMap();
} else {
attrs = getMap(id).getAll(RedissonSession.ATTRS);
}
} catch (Exception e) { } catch (Exception e) {
throw new IOException(e); log.error("Can't read session object by id: " + id, e);
} }
RedissonSession session = (RedissonSession) createEmptySession(); RedissonSession session = (RedissonSession) createEmptySession();
......
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSession.java
浏览文件 @ d8ae21e5
...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession { ...@@ -51,6 +51,7 @@ public class RedissonSession extends StandardSession {
public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR, public static final Set<String> ATTRS = new HashSet<String>(Arrays.asList(IS_NEW_ATTR, IS_VALID_ATTR,
THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR)); THIS_ACCESSED_TIME_ATTR, MAX_INACTIVE_INTERVAL_ATTR, LAST_ACCESSED_TIME_ATTR, CREATION_TIME_ATTR));
private boolean loaded;
private final RedissonSessionManager redissonManager; private final RedissonSessionManager redissonManager;
private final Map<String, Object> attrs; private final Map<String, Object> attrs;
private RMap<String, Object> map; private RMap<String, Object> map;
...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession { ...@@ -87,6 +88,17 @@ public class RedissonSession extends StandardSession {
} }
return map.get(name); return map.get(name);
} else {
if (!loaded) {
synchronized (this) {
if (!loaded) {
Map<String, Object> storedAttrs = map.readAllMap();
load(storedAttrs);
loaded = true;
}
}
}
} }
return super.getAttribute(name); return super.getAttribute(name);
......
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
浏览文件 @ d8ae21e5
...@@ -147,13 +147,9 @@ public class RedissonSessionManager extends ManagerBase { ...@@ -147,13 +147,9 @@ public class RedissonSessionManager extends ManagerBase {
if (id != null) { if (id != null) {
Map<String, Object> attrs = new HashMap<String, Object>(); Map<String, Object> attrs = new HashMap<String, Object>();
try { try {
if (readMode == ReadMode.MEMORY) { attrs = getMap(id).getAll(RedissonSession.ATTRS);
attrs = getMap(id).readAllMap();
} else {
attrs = getMap(id).getAll(RedissonSession.ATTRS);
}
} catch (Exception e) { } catch (Exception e) {
throw new IOException(e); log.error("Can't read session object by id: " + id, e);
} }
RedissonSession session = (RedissonSession) createEmptySession(); RedissonSession session = (RedissonSession) createEmptySession();
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或