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

Fixed - ClassNotFoundException arise in Tomcat session manager #1454

Browse Source
pull/1547/head
Nikita 7 years ago
parent 1a61d03655
commit bb491f60f1
16 changed files with 188 additions and 52 deletions
Show Stats Download Patch File Download Diff File

6
redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/AttributeUpdateMessage.java
Unescape Escape View File

@ -23,12 +23,12 @@ package org.redisson.tomcat;
public class AttributeUpdateMessage extends AttributeMessage { public class AttributeUpdateMessage extends AttributeMessage {
private String name; private String name;
private Object value; private byte[] value;
public AttributeUpdateMessage() { public AttributeUpdateMessage() {
} }
public AttributeUpdateMessage(String sessionId, String name, Object value) { public AttributeUpdateMessage(String sessionId, String name, byte[] value) {
super(sessionId); super(sessionId);
this.name = name; this.name = name;
this.value = value; this.value = value;
@ -38,7 +38,7 @@ public class AttributeUpdateMessage extends AttributeMessage {
return name; return name;
} }
public Object getValue() { public byte[] getValue() {
return value; return value;
} }

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

@ -24,17 +24,17 @@ import java.util.Map;
*/ */
public class AttributesPutAllMessage extends AttributeMessage { public class AttributesPutAllMessage extends AttributeMessage {
private Map<String, Object> attrs; private Map<String, byte[]> attrs;
public AttributesPutAllMessage() { public AttributesPutAllMessage() {
} }
public AttributesPutAllMessage(String sessionId, Map<String, Object> attrs) { public AttributesPutAllMessage(String sessionId, Map<String, byte[]> attrs) {
super(sessionId); super(sessionId);
this.attrs = attrs; this.attrs = attrs;
} }
public Map<String, Object> getAttrs() { public Map<String, byte[]> getAttrs() {
return attrs; return attrs;
} }

16
redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -93,7 +93,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
} }
} }
@ -108,7 +108,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (getMaxInactiveInterval() >= 0) { if (getMaxInactiveInterval() >= 0) {
map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS); map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS);
@ -116,6 +116,14 @@ public class RedissonSession extends StandardSession {
} }
} }
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
Map<String, byte[]> map = new HashMap<String, byte[]>();
for (Entry<String, Object> entry : newMap.entrySet()) {
map.put(entry.getKey(), redissonManager.encode(entry.getValue()));
}
return new AttributesPutAllMessage(getId(), map);
}
@Override @Override
public void setMaxInactiveInterval(int interval) { public void setMaxInactiveInterval(int interval) {
super.setMaxInactiveInterval(interval); super.setMaxInactiveInterval(interval);
@ -131,7 +139,7 @@ public class RedissonSession extends StandardSession {
private void fastPut(String name, Object value) { private void fastPut(String name, Object value) {
map.fastPut(name, value); map.fastPut(name, value);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributeUpdateMessage(getId(), name, value)); topic.publish(new AttributeUpdateMessage(getId(), name, redissonManager.encode(value)));
} }
} }
@ -213,7 +221,7 @@ public class RedissonSession extends StandardSession {
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (maxInactiveInterval >= 0) { if (maxInactiveInterval >= 0) {

30
redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -39,6 +39,9 @@ import org.redisson.api.listener.MessageListener;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.config.Config; import org.redisson.config.Config;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
/** /**
* Redisson Session Manager for Apache Tomcat * Redisson Session Manager for Apache Tomcat
* *
@ -193,6 +196,27 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
} }
} }
protected Object decode(byte[] bb) throws IOException {
ByteBuf buf = ByteBufAllocator.DEFAULT.buffer(bb.length);
buf.writeBytes(bb);
Object value = redisson.getConfig().getCodec().getValueDecoder().decode(buf, null);
buf.release();
return value;
}
public byte[] encode(Object value) {
try {
ByteBuf encoded = redisson.getConfig().getCodec().getValueEncoder().encode(value);
byte[] dst = new byte[encoded.readableBytes()];
encoded.readBytes(dst);
encoded.release();
return dst;
} catch (IOException e) {
log.error("Unable to encode object", e);
throw new IllegalStateException(e);
}
}
public RedissonClient getRedisson() { public RedissonClient getRedisson() {
return redisson; return redisson;
} }
@ -225,14 +249,14 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
if (msg instanceof AttributesPutAllMessage) { if (msg instanceof AttributesPutAllMessage) {
AttributesPutAllMessage m = (AttributesPutAllMessage) msg; AttributesPutAllMessage m = (AttributesPutAllMessage) msg;
for (Entry<String, Object> entry : m.getAttrs().entrySet()) { for (Entry<String, byte[]> entry : m.getAttrs().entrySet()) {
session.superSetAttribute(entry.getKey(), entry.getValue(), true); session.superSetAttribute(entry.getKey(), decode(entry.getValue()), true);
} }
} }
if (msg instanceof AttributeUpdateMessage) { if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg; AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(), true); session.superSetAttribute(m.getName(), decode(m.getValue()), true);
} }
} }
} catch (IOException e) { } catch (IOException e) {

6
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/AttributeUpdateMessage.java
Unescape Escape View File

@ -23,12 +23,12 @@ package org.redisson.tomcat;
public class AttributeUpdateMessage extends AttributeMessage { public class AttributeUpdateMessage extends AttributeMessage {
private String name; private String name;
private Object value; private byte[] value;
public AttributeUpdateMessage() { public AttributeUpdateMessage() {
} }
public AttributeUpdateMessage(String sessionId, String name, Object value) { public AttributeUpdateMessage(String sessionId, String name, byte[] value) {
super(sessionId); super(sessionId);
this.name = name; this.name = name;
this.value = value; this.value = value;
@ -38,7 +38,7 @@ public class AttributeUpdateMessage extends AttributeMessage {
return name; return name;
} }
public Object getValue() { public byte[] getValue() {
return value; return value;
} }

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

@ -24,17 +24,17 @@ import java.util.Map;
*/ */
public class AttributesPutAllMessage extends AttributeMessage { public class AttributesPutAllMessage extends AttributeMessage {
private Map<String, Object> attrs; private Map<String, byte[]> attrs;
public AttributesPutAllMessage() { public AttributesPutAllMessage() {
} }
public AttributesPutAllMessage(String sessionId, Map<String, Object> attrs) { public AttributesPutAllMessage(String sessionId, Map<String, byte[]> attrs) {
super(sessionId); super(sessionId);
this.attrs = attrs; this.attrs = attrs;
} }
public Map<String, Object> getAttrs() { public Map<String, byte[]> getAttrs() {
return attrs; return attrs;
} }

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

@ -93,7 +93,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
} }
} }
@ -108,7 +108,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (getMaxInactiveInterval() >= 0) { if (getMaxInactiveInterval() >= 0) {
map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS); map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS);
@ -116,6 +116,14 @@ public class RedissonSession extends StandardSession {
} }
} }
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
Map<String, byte[]> map = new HashMap<String, byte[]>();
for (Entry<String, Object> entry : newMap.entrySet()) {
map.put(entry.getKey(), redissonManager.encode(entry.getValue()));
}
return new AttributesPutAllMessage(getId(), map);
}
@Override @Override
public void setMaxInactiveInterval(int interval) { public void setMaxInactiveInterval(int interval) {
super.setMaxInactiveInterval(interval); super.setMaxInactiveInterval(interval);
@ -131,7 +139,7 @@ public class RedissonSession extends StandardSession {
private void fastPut(String name, Object value) { private void fastPut(String name, Object value) {
map.fastPut(name, value); map.fastPut(name, value);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributeUpdateMessage(getId(), name, value)); topic.publish(new AttributeUpdateMessage(getId(), name, redissonManager.encode(value)));
} }
} }
@ -213,7 +221,7 @@ public class RedissonSession extends StandardSession {
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (maxInactiveInterval >= 0) { if (maxInactiveInterval >= 0) {

30
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -37,6 +37,9 @@ import org.redisson.api.listener.MessageListener;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.config.Config; import org.redisson.config.Config;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
/** /**
* Redisson Session Manager for Apache Tomcat * Redisson Session Manager for Apache Tomcat
* *
@ -172,6 +175,27 @@ public class RedissonSessionManager extends ManagerBase {
} }
} }
protected Object decode(byte[] bb) throws IOException {
ByteBuf buf = ByteBufAllocator.DEFAULT.buffer(bb.length);
buf.writeBytes(bb);
Object value = redisson.getConfig().getCodec().getValueDecoder().decode(buf, null);
buf.release();
return value;
}
public byte[] encode(Object value) {
try {
ByteBuf encoded = redisson.getConfig().getCodec().getValueEncoder().encode(value);
byte[] dst = new byte[encoded.readableBytes()];
encoded.readBytes(dst);
encoded.release();
return dst;
} catch (IOException e) {
log.error("Unable to encode object", e);
throw new IllegalStateException(e);
}
}
public RedissonClient getRedisson() { public RedissonClient getRedisson() {
return redisson; return redisson;
} }
@ -205,14 +229,14 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributesPutAllMessage) { if (msg instanceof AttributesPutAllMessage) {
AttributesPutAllMessage m = (AttributesPutAllMessage) msg; AttributesPutAllMessage m = (AttributesPutAllMessage) msg;
for (Entry<String, Object> entry : m.getAttrs().entrySet()) { for (Entry<String, byte[]> entry : m.getAttrs().entrySet()) {
session.superSetAttribute(entry.getKey(), entry.getValue(), true); session.superSetAttribute(entry.getKey(), decode(entry.getValue()), true);
} }
} }
if (msg instanceof AttributeUpdateMessage) { if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg; AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(), true); session.superSetAttribute(m.getName(), decode(m.getValue()), true);
} }
} }
} catch (IOException e) { } catch (IOException e) {

6
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/AttributeUpdateMessage.java
Unescape Escape View File

@ -23,12 +23,12 @@ package org.redisson.tomcat;
public class AttributeUpdateMessage extends AttributeMessage { public class AttributeUpdateMessage extends AttributeMessage {
private String name; private String name;
private Object value; private byte[] value;
public AttributeUpdateMessage() { public AttributeUpdateMessage() {
} }
public AttributeUpdateMessage(String sessionId, String name, Object value) { public AttributeUpdateMessage(String sessionId, String name, byte[] value) {
super(sessionId); super(sessionId);
this.name = name; this.name = name;
this.value = value; this.value = value;
@ -38,7 +38,7 @@ public class AttributeUpdateMessage extends AttributeMessage {
return name; return name;
} }
public Object getValue() { public byte[] getValue() {
return value; return value;
} }

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

@ -24,17 +24,17 @@ import java.util.Map;
*/ */
public class AttributesPutAllMessage extends AttributeMessage { public class AttributesPutAllMessage extends AttributeMessage {
private Map<String, Object> attrs; private Map<String, byte[]> attrs;
public AttributesPutAllMessage() { public AttributesPutAllMessage() {
} }
public AttributesPutAllMessage(String sessionId, Map<String, Object> attrs) { public AttributesPutAllMessage(String sessionId, Map<String, byte[]> attrs) {
super(sessionId); super(sessionId);
this.attrs = attrs; this.attrs = attrs;
} }
public Map<String, Object> getAttrs() { public Map<String, byte[]> getAttrs() {
return attrs; return attrs;
} }

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

@ -93,7 +93,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
} }
} }
@ -108,7 +108,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (getMaxInactiveInterval() >= 0) { if (getMaxInactiveInterval() >= 0) {
map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS); map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS);
@ -116,6 +116,14 @@ public class RedissonSession extends StandardSession {
} }
} }
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
Map<String, byte[]> map = new HashMap<String, byte[]>();
for (Entry<String, Object> entry : newMap.entrySet()) {
map.put(entry.getKey(), redissonManager.encode(entry.getValue()));
}
return new AttributesPutAllMessage(getId(), map);
}
@Override @Override
public void setMaxInactiveInterval(int interval) { public void setMaxInactiveInterval(int interval) {
super.setMaxInactiveInterval(interval); super.setMaxInactiveInterval(interval);
@ -131,7 +139,7 @@ public class RedissonSession extends StandardSession {
private void fastPut(String name, Object value) { private void fastPut(String name, Object value) {
map.fastPut(name, value); map.fastPut(name, value);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributeUpdateMessage(getId(), name, value)); topic.publish(new AttributeUpdateMessage(getId(), name, redissonManager.encode(value)));
} }
} }
@ -213,7 +221,7 @@ public class RedissonSession extends StandardSession {
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (maxInactiveInterval >= 0) { if (maxInactiveInterval >= 0) {

34
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -36,6 +36,9 @@ import org.redisson.api.listener.MessageListener;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.config.Config; import org.redisson.config.Config;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
/** /**
* Redisson Session Manager for Apache Tomcat * Redisson Session Manager for Apache Tomcat
* *
@ -171,6 +174,27 @@ public class RedissonSessionManager extends ManagerBase {
} }
} }
protected Object decode(byte[] bb) throws IOException {
ByteBuf buf = ByteBufAllocator.DEFAULT.buffer(bb.length);
buf.writeBytes(bb);
Object value = redisson.getConfig().getCodec().getValueDecoder().decode(buf, null);
buf.release();
return value;
}
public byte[] encode(Object value) {
try {
ByteBuf encoded = redisson.getConfig().getCodec().getValueEncoder().encode(value);
byte[] dst = new byte[encoded.readableBytes()];
encoded.readBytes(dst);
encoded.release();
return dst;
} catch (IOException e) {
log.error("Unable to encode object", e);
throw new IllegalStateException(e);
}
}
public RedissonClient getRedisson() { public RedissonClient getRedisson() {
return redisson; return redisson;
} }
@ -204,14 +228,14 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributesPutAllMessage) { if (msg instanceof AttributesPutAllMessage) {
AttributesPutAllMessage m = (AttributesPutAllMessage) msg; AttributesPutAllMessage m = (AttributesPutAllMessage) msg;
for (Entry<String, Object> entry : m.getAttrs().entrySet()) { for (Entry<String, byte[]> entry : m.getAttrs().entrySet()) {
session.superSetAttribute(entry.getKey(), entry.getValue(), true); session.superSetAttribute(entry.getKey(), decode(entry.getValue()), true);
} }
} }
if (msg instanceof AttributeUpdateMessage) { if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg; AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(), true); session.superSetAttribute(m.getName(), decode(m.getValue()), true);
} }
} }
} catch (IOException e) { } catch (IOException e) {
@ -238,11 +262,15 @@ public class RedissonSessionManager extends ManagerBase {
} }
} }
try {
try { try {
Config c = new Config(config); Config c = new Config(config);
Codec codec = c.getCodec().getClass().getConstructor(ClassLoader.class) Codec codec = c.getCodec().getClass().getConstructor(ClassLoader.class)
.newInstance(Thread.currentThread().getContextClassLoader()); .newInstance(Thread.currentThread().getContextClassLoader());
config.setCodec(codec); config.setCodec(codec);
} catch (Exception e) {
throw new IllegalStateException("Unable to initialize codec with ClassLoader parameter", e);
}
return Redisson.create(config); return Redisson.create(config);
} catch (Exception e) { } catch (Exception e) {

6
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/AttributeUpdateMessage.java
Unescape Escape View File

@ -23,12 +23,12 @@ package org.redisson.tomcat;
public class AttributeUpdateMessage extends AttributeMessage { public class AttributeUpdateMessage extends AttributeMessage {
private String name; private String name;
private Object value; private byte[] value;
public AttributeUpdateMessage() { public AttributeUpdateMessage() {
} }
public AttributeUpdateMessage(String sessionId, String name, Object value) { public AttributeUpdateMessage(String sessionId, String name, byte[] value) {
super(sessionId); super(sessionId);
this.name = name; this.name = name;
this.value = value; this.value = value;
@ -38,7 +38,7 @@ public class AttributeUpdateMessage extends AttributeMessage {
return name; return name;
} }
public Object getValue() { public byte[] getValue() {
return value; return value;
} }

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

@ -24,17 +24,17 @@ import java.util.Map;
*/ */
public class AttributesPutAllMessage extends AttributeMessage { public class AttributesPutAllMessage extends AttributeMessage {
private Map<String, Object> attrs; private Map<String, byte[]> attrs;
public AttributesPutAllMessage() { public AttributesPutAllMessage() {
} }
public AttributesPutAllMessage(String sessionId, Map<String, Object> attrs) { public AttributesPutAllMessage(String sessionId, Map<String, byte[]> attrs) {
super(sessionId); super(sessionId);
this.attrs = attrs; this.attrs = attrs;
} }
public Map<String, Object> getAttrs() { public Map<String, byte[]> getAttrs() {
return attrs; return attrs;
} }

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

@ -93,7 +93,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
} }
} }
@ -108,7 +108,7 @@ public class RedissonSession extends StandardSession {
newMap.put("session:thisAccessedTime", thisAccessedTime); newMap.put("session:thisAccessedTime", thisAccessedTime);
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (getMaxInactiveInterval() >= 0) { if (getMaxInactiveInterval() >= 0) {
map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS); map.expire(getMaxInactiveInterval(), TimeUnit.SECONDS);
@ -116,6 +116,14 @@ public class RedissonSession extends StandardSession {
} }
} }
protected AttributesPutAllMessage createPutAllMessage(Map<String, Object> newMap) {
Map<String, byte[]> map = new HashMap<String, byte[]>();
for (Entry<String, Object> entry : newMap.entrySet()) {
map.put(entry.getKey(), redissonManager.encode(entry.getValue()));
}
return new AttributesPutAllMessage(getId(), map);
}
@Override @Override
public void setMaxInactiveInterval(int interval) { public void setMaxInactiveInterval(int interval) {
super.setMaxInactiveInterval(interval); super.setMaxInactiveInterval(interval);
@ -131,7 +139,7 @@ public class RedissonSession extends StandardSession {
private void fastPut(String name, Object value) { private void fastPut(String name, Object value) {
map.fastPut(name, value); map.fastPut(name, value);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributeUpdateMessage(getId(), name, value)); topic.publish(new AttributeUpdateMessage(getId(), name, redissonManager.encode(value)));
} }
} }
@ -213,7 +221,7 @@ public class RedissonSession extends StandardSession {
map.putAll(newMap); map.putAll(newMap);
if (readMode == ReadMode.MEMORY) { if (readMode == ReadMode.MEMORY) {
topic.publish(new AttributesPutAllMessage(getId(), newMap)); topic.publish(createPutAllMessage(newMap));
} }
if (maxInactiveInterval >= 0) { if (maxInactiveInterval >= 0) {

34
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -36,6 +36,9 @@ import org.redisson.api.listener.MessageListener;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.config.Config; import org.redisson.config.Config;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
/** /**
* Redisson Session Manager for Apache Tomcat * Redisson Session Manager for Apache Tomcat
* *
@ -171,6 +174,27 @@ public class RedissonSessionManager extends ManagerBase {
} }
} }
protected Object decode(byte[] bb) throws IOException {
ByteBuf buf = ByteBufAllocator.DEFAULT.buffer(bb.length);
buf.writeBytes(bb);
Object value = redisson.getConfig().getCodec().getValueDecoder().decode(buf, null);
buf.release();
return value;
}
public byte[] encode(Object value) {
try {
ByteBuf encoded = redisson.getConfig().getCodec().getValueEncoder().encode(value);
byte[] dst = new byte[encoded.readableBytes()];
encoded.readBytes(dst);
encoded.release();
return dst;
} catch (IOException e) {
log.error("Unable to encode object", e);
throw new IllegalStateException(e);
}
}
public RedissonClient getRedisson() { public RedissonClient getRedisson() {
return redisson; return redisson;
} }
@ -204,14 +228,14 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributesPutAllMessage) { if (msg instanceof AttributesPutAllMessage) {
AttributesPutAllMessage m = (AttributesPutAllMessage) msg; AttributesPutAllMessage m = (AttributesPutAllMessage) msg;
for (Entry<String, Object> entry : m.getAttrs().entrySet()) { for (Entry<String, byte[]> entry : m.getAttrs().entrySet()) {
session.superSetAttribute(entry.getKey(), entry.getValue(), true); session.superSetAttribute(entry.getKey(), decode(entry.getValue()), true);
} }
} }
if (msg instanceof AttributeUpdateMessage) { if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg; AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(), true); session.superSetAttribute(m.getName(), decode(m.getValue()), true);
} }
} }
} catch (IOException e) { } catch (IOException e) {
@ -238,11 +262,15 @@ public class RedissonSessionManager extends ManagerBase {
} }
} }
try {
try { try {
Config c = new Config(config); Config c = new Config(config);
Codec codec = c.getCodec().getClass().getConstructor(ClassLoader.class) Codec codec = c.getCodec().getClass().getConstructor(ClassLoader.class)
.newInstance(Thread.currentThread().getContextClassLoader()); .newInstance(Thread.currentThread().getContextClassLoader());
config.setCodec(codec); config.setCodec(codec);
} catch (Exception e) {
throw new IllegalStateException("Unable to initialize codec with ClassLoader parameter", e);
}
return Redisson.create(config); return Redisson.create(config);
} catch (Exception e) { } catch (Exception e) {

Write Preview
Loading…
Cancel
Save