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

HHH-8558 - Bytecode enhancer: fix classloading issues on testsuite

This commit is contained in:
barreiro 2015-06-16 18:00:18 +01:00 committed by Steve Ebersole
parent d5ed3a87c4
commit 8053fa7698
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoader.java
View File

@ -35,7 +35,7 @@ public class LazyAttributeLoader implements PersistentAttributeInterceptor {
} }
protected final Object intercept(Object target, String fieldName, Object value) { protected final Object intercept(Object target, String fieldName, Object value) {
if ( lazyFields != null && lazyFields.contains( fieldName ) && initializedFields.contains( fieldName ) ) { if ( lazyFields != null && lazyFields.contains( fieldName ) && !initializedFields.contains( fieldName ) ) {
if ( session == null ) { if ( session == null ) {
throw new LazyInitializationException( "entity with lazy properties is not associated with a session" ); throw new LazyInitializationException( "entity with lazy properties is not associated with a session" );
} }

19
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/AbstractEnhancerTestTask.java
View File

@ -7,6 +7,9 @@
package org.hibernate.test.bytecode.enhancement; package org.hibernate.test.bytecode.enhancement;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
@ -21,18 +24,20 @@ public abstract class AbstractEnhancerTestTask implements EnhancerTestTask {
private ServiceRegistry serviceRegistry; private ServiceRegistry serviceRegistry;
private SessionFactory factory; private SessionFactory factory;
public final void prepare(Configuration user) { public final void prepare(Configuration config) {
Configuration cfg = new Configuration(); config.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
cfg.setProperties( user.getProperties() );
cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
Class<?>[] resources = getAnnotatedClasses(); Class<?>[] resources = getAnnotatedClasses();
for ( Class<?> resource : resources ) { for ( Class<?> resource : resources ) {
cfg.addAnnotatedClass( resource ); config.addAnnotatedClass( resource );
} }
serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); StandardServiceRegistryBuilder serviceBuilder = new StandardServiceRegistryBuilder( );
factory = cfg.buildSessionFactory( serviceRegistry ); serviceBuilder.addService( ClassLoaderService.class, new ClassLoaderServiceImpl( Thread.currentThread().getContextClassLoader() ) );
serviceBuilder.applySettings( config.getProperties() );
serviceRegistry = serviceBuilder.build();
factory = config.buildSessionFactory( serviceRegistry );
} }
public final void complete() { public final void complete() {

1
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingTestTask.java
View File

@ -8,7 +8,6 @@ package org.hibernate.test.bytecode.enhancement.lazy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;