github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed - ConcurrentModificationException thrown on RedissonSession save method if readMode = MEMORY and updateMode = AFTER_REQUEST #5677

Browse Source
pull/5711/head
Nikita Koksharov 10 months ago
parent 4036874862
commit 64d1ab55d4
8 changed files with 76 additions and 60 deletions
Show Stats Download Patch File Download Diff File

32
redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/AttributesPutAllMessage.java
Unescape Escape View File

@ -37,26 +37,30 @@ public class AttributesPutAllMessage extends AttributeMessage {
public AttributesPutAllMessage() {
}
public AttributesPutAllMessage(String nodeId, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(nodeId, sessionId);
public AttributesPutAllMessage(RedissonSessionManager redissonSessionManager, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(redissonSessionManager.getNodeId(), sessionId);
if (attrs != null) {
this.attrs = new HashMap<>();
for (Entry<String, Object> entry: attrs.entrySet()) {
Object value = entry.getValue();
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
if (redissonSessionManager.getReadMode()
.equals(RedissonSessionManager.ReadMode.MEMORY.toString())) {
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
this.attrs.put(entry.getKey(), toByteArray(encoder, value));
}
} else {

2
redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -236,7 +236,7 @@ public class RedissonSession extends StandardSession {
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
try {
return new AttributesPutAllMessage(redissonManager.getNodeId(), getId(), newMap, this.map.getCodec().getMapValueEncoder());
return new AttributesPutAllMessage(redissonManager, getId(), newMap, this.map.getCodec().getMapValueEncoder());
} catch (Exception e) {
throw new IllegalStateException(e);
}

32
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/AttributesPutAllMessage.java
Unescape Escape View File

@ -36,26 +36,30 @@ public class AttributesPutAllMessage extends AttributeMessage {
public AttributesPutAllMessage() {
}
public AttributesPutAllMessage(String nodeId, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(nodeId, sessionId);
public AttributesPutAllMessage(RedissonSessionManager redissonSessionManager, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(redissonSessionManager.getNodeId(), sessionId);
if (attrs != null) {
this.attrs = new HashMap<>();
for (Entry<String, Object> entry: attrs.entrySet()) {
Object value = entry.getValue();
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
if (redissonSessionManager.getReadMode()
.equals(RedissonSessionManager.ReadMode.MEMORY.toString())) {
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
this.attrs.put(entry.getKey(), toByteArray(encoder, value));
}
} else {

2
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -230,7 +230,7 @@ public class RedissonSession extends StandardSession {
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
try {
return new AttributesPutAllMessage(redissonManager.getNodeId(), getId(), newMap, this.map.getCodec().getMapValueEncoder());
return new AttributesPutAllMessage(redissonManager, getId(), newMap, this.map.getCodec().getMapValueEncoder());
} catch (Exception e) {
throw new IllegalStateException(e);
}

32
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/AttributesPutAllMessage.java
Unescape Escape View File

@ -36,26 +36,30 @@ public class AttributesPutAllMessage extends AttributeMessage {
public AttributesPutAllMessage() {
}
public AttributesPutAllMessage(String nodeId, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(nodeId, sessionId);
public AttributesPutAllMessage(RedissonSessionManager redissonSessionManager, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(redissonSessionManager.getNodeId(), sessionId);
if (attrs != null) {
this.attrs = new HashMap<>();
for (Entry<String, Object> entry: attrs.entrySet()) {
Object value = entry.getValue();
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
if (redissonSessionManager.getReadMode()
.equals(RedissonSessionManager.ReadMode.MEMORY.toString())) {
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
this.attrs.put(entry.getKey(), toByteArray(encoder, value));
}
} else {

2
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -231,7 +231,7 @@ public class RedissonSession extends StandardSession {
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
try {
return new AttributesPutAllMessage(redissonManager.getNodeId(), getId(), newMap, this.map.getCodec().getMapValueEncoder());
return new AttributesPutAllMessage(redissonManager, getId(), newMap, this.map.getCodec().getMapValueEncoder());
} catch (Exception e) {
throw new IllegalStateException(e);
}

32
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/AttributesPutAllMessage.java
Unescape Escape View File

@ -36,26 +36,30 @@ public class AttributesPutAllMessage extends AttributeMessage {
public AttributesPutAllMessage() {
}
public AttributesPutAllMessage(String nodeId, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(nodeId, sessionId);
public AttributesPutAllMessage(RedissonSessionManager redissonSessionManager, String sessionId, Map<String, Object> attrs, Encoder encoder) throws Exception {
super(redissonSessionManager.getNodeId(), sessionId);
if (attrs != null) {
this.attrs = new HashMap<>();
for (Entry<String, Object> entry: attrs.entrySet()) {
Object value = entry.getValue();
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
if (redissonSessionManager.getReadMode()
.equals(RedissonSessionManager.ReadMode.MEMORY.toString())) {
try {
if (value instanceof Collection) {
Collection newInstance = (Collection) value.getClass().getDeclaredConstructor().newInstance();
newInstance.addAll((Collection) value);
value = newInstance;
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
if (value instanceof Map) {
Map newInstance = (Map) value.getClass().getDeclaredConstructor().newInstance();
newInstance.putAll((Map) value);
value = newInstance;
}
} catch (Exception e) {
// can't be copied
}
this.attrs.put(entry.getKey(), toByteArray(encoder, value));
}
} else {

2
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -231,7 +231,7 @@ public class RedissonSession extends StandardSession {
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
try {
return new AttributesPutAllMessage(redissonManager.getNodeId(), getId(), newMap, this.map.getCodec().getMapValueEncoder());
return new AttributesPutAllMessage(redissonManager, getId(), newMap, this.map.getCodec().getMapValueEncoder());
} catch (Exception e) {
throw new IllegalStateException(e);
}

Write Preview
Loading…
Cancel
Save