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

HHH-8748 replace Javassist's ProxyObject with Proxy 

Conflicts:
	hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
This commit is contained in:
Brett Meyer 2013-11-26 13:59:03 -05:00
parent 50a73150da
commit e38cb21ef2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java
View File

@ -28,7 +28,7 @@ import java.util.HashMap;
import javassist.util.proxy.MethodFilter;
import javassist.util.proxy.MethodHandler;
import javassist.util.proxy.ProxyObject;
import javassist.util.proxy.Proxy;
import org.hibernate.AssertionFailure;
import org.hibernate.HibernateException;
@ -77,7 +77,7 @@ public class ProxyFactoryFactoryImpl implements ProxyFactoryFactory {
public Object getProxy() {
try {
ProxyObject proxy = ( ProxyObject ) proxyClass.newInstance();
final Proxy proxy = (Proxy) proxyClass.newInstance();
proxy.setHandler( new PassThroughHandler( proxy, proxyClass.getName() ) );
return proxy;
}

8
hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
View File

@ -29,9 +29,8 @@ import java.lang.reflect.Method;
import javassist.util.proxy.MethodFilter;
import javassist.util.proxy.MethodHandler;
import javassist.util.proxy.Proxy;
import javassist.util.proxy.ProxyFactory;
import javassist.util.proxy.ProxyObject;
import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SessionImplementor;
@ -40,6 +39,7 @@ import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.pojo.BasicLazyInitializer;
import org.hibernate.type.CompositeType;
import org.jboss.logging.Logger;
/**
* A Javassist-based lazy initializer proxy.
@ -102,7 +102,7 @@ public class JavassistLazyInitializer extends BasicLazyInitializer implements Me
factory.setFilter( FINALIZE_FILTER );
Class cl = factory.createClass();
final HibernateProxy proxy = ( HibernateProxy ) cl.newInstance();
( ( ProxyObject ) proxy ).setHandler( instance );
( ( Proxy ) proxy ).setHandler( instance );
instance.constructed = true;
return proxy;
}
@ -145,7 +145,7 @@ public class JavassistLazyInitializer extends BasicLazyInitializer implements Me
+ persistentClass.getName(), e
);
}
( ( ProxyObject ) proxy ).setHandler( instance );
( ( Proxy ) proxy ).setHandler( instance );
instance.constructed = true;
return proxy;
}