Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-5826 : SerializationHelper.resolveClass() never tries loader3

This commit is contained in:
Gail Badner 2011-01-11 17:21:08 -08:00
parent ca057ccb4c
commit 1c158b0bb7
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/util/SerializationHelper.java
View File

@ -356,7 +356,7 @@ public final class SerializationHelper {
if ( different( loader1, loader3 ) && different( loader2, loader3 ) ) {
try {
return Class.forName( className, false, loader2 );
return Class.forName( className, false, loader3 );
}
catch ( ClassNotFoundException e ) {
log.trace( "Unable to locate class using given classloader" );

24
hibernate-core/src/test/java/org/hibernate/util/SerializationHelperTest.java
View File

@ -28,6 +28,7 @@ import java.io.Serializable;
import junit.framework.TestCase;
import org.hibernate.LockMode;
import org.hibernate.bytecode.util.ByteCodeHelper;
/**
@ -68,12 +69,35 @@ public class SerializationHelperTest extends TestCase {
assertEquals( custom, instance2.getClass().getClassLoader() );
}
public void testSerDeserClassUnknownToCustomLoader() throws Exception {
Object instance = LockMode.OPTIMISTIC;
assertSame(
SerializationHelper.hibernateClassLoader(),
instance.getClass().getClassLoader()
);
// SerializableType.toBytes() logic, as called from SerializableType.disassemble()
byte[] bytes = SerializationHelper.serialize( (Serializable) instance );
// SerializableType.fromBytes() logic, as called from SerializableType.assemble
// NOTE : specifically we use custom so that LockType.class is not found
// until the 3rd loader (because loader1 == loader2, the custom classloader)
Object instance2 = SerializationHelper.deserialize( bytes, custom );
assertSame( instance.getClass(), instance2.getClass() );
assertSame( instance.getClass().getClassLoader(), instance2.getClass().getClassLoader() );
}
public static class CustomClassLoader extends ClassLoader {
public CustomClassLoader(ClassLoader parent) {
super( parent );
}
public Class loadClass(String name) throws ClassNotFoundException {
if ( name.equals( "org.hibernate.LockMode" ) ) {
throw new ClassNotFoundException( "Could not find "+ name );
}
if ( ! name.equals( "org.hibernate.util.SerializableThing" ) ) {
return getParent().loadClass( name );
}