test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-7134 Error when deserializing object which uses UserSessionSource in constructor (fix review)

Browse Source
This commit is contained in:
Andrey Subbotin 2016-05-18 15:41:28 +04:00
parent 7c6d2dccb4
commit 7dfead845e
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/global/src/com/haulmont/cuba/core/sys/serialization/KryoSerialization.java
View File

@ -54,6 +54,8 @@ import org.eclipse.persistence.jpa.jpql.parser.DateTime;
import org.objenesis.instantiator.ObjectInstantiator;
import org.objenesis.strategy.InstantiatorStrategy;
import org.objenesis.strategy.StdInstantiatorStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
import java.lang.reflect.Constructor;
@ -71,6 +73,8 @@ import java.util.GregorianCalendar;
*/
public class KryoSerialization implements Serialization {
protected static final Logger log = LoggerFactory.getLogger(KryoSerialization.class);
protected boolean onlySerializable = true;
protected final ThreadLocal<Kryo> kryos = new ThreadLocal<Kryo>() {
@Override
@ -247,23 +251,24 @@ public class KryoSerialization implements Serialization {
@Override
public ObjectInstantiator newInstantiatorOf(Class type) {
if (!Util.isAndroid) {
// Use ReflectASM if the class is not a non-static member class.
Class enclosingType = type.getEnclosingClass();
boolean isNonStaticMemberClass = enclosingType != null && type.isMemberClass()
&& !Modifier.isStatic(type.getModifiers());
if (!isNonStaticMemberClass) {
try {
final ConstructorAccess access = ConstructorAccess.get(type);
return () -> {
try {
return access.newInstance();
} catch (Exception ex) {
return fallbackStrategy.newInstantiatorOf(type).newInstance();
// Use ReflectASM if the class is not a non-static member class.
Class enclosingType = type.getEnclosingClass();
boolean isNonStaticMemberClass = enclosingType != null && type.isMemberClass()
&& !Modifier.isStatic(type.getModifiers());
if (!isNonStaticMemberClass) {
try {
final ConstructorAccess access = ConstructorAccess.get(type);
return () -> {
try {
return access.newInstance();
} catch (Exception ex) {
if (log.isTraceEnabled()) {
log.trace("Unable instantiate " + Util.className(type), ex);
}
};
} catch (Exception ignored) {
}
return fallbackStrategy.newInstantiatorOf(type).newInstance();
}
};
} catch (Exception ignored) {
}
}
// Reflection.
@ -280,6 +285,9 @@ public class KryoSerialization implements Serialization {
try {
return constructor.newInstance();
} catch (Exception ex) {
if (log.isTraceEnabled()) {
log.trace("Unable instantiate " + Util.className(type), ex);
}
return fallbackStrategy.newInstantiatorOf(type).newInstance();
}
};