mirror of
https://github.com/hibernate/hibernate-orm
synced 2025-02-16 08:05:05 +00:00
HHH-8310 : Lob proxy class loading problem
(cherry picked from commit 365bfe99d857b7fa62108cff05fba28a5fb7b7e6)
This commit is contained in:
parent
d0be11f503
commit
10df4cc79d
@ -32,7 +32,6 @@
|
||||
import java.sql.SQLException;
|
||||
|
||||
import org.hibernate.engine.jdbc.internal.BinaryStreamImpl;
|
||||
import org.hibernate.internal.util.ClassLoaderHelper;
|
||||
import org.hibernate.type.descriptor.java.DataHelper;
|
||||
|
||||
/**
|
||||
@ -195,11 +194,7 @@ public static Blob generateProxy(InputStream stream, long length) {
|
||||
* @return The class loader appropriate for proxy construction.
|
||||
*/
|
||||
private static ClassLoader getProxyClassLoader() {
|
||||
ClassLoader cl = ClassLoaderHelper.getContextClassLoader();
|
||||
if ( cl == null ) {
|
||||
cl = BlobImplementer.class.getClassLoader();
|
||||
}
|
||||
return cl;
|
||||
return BlobImplementer.class.getClassLoader();
|
||||
}
|
||||
|
||||
private static class StreamBackedBinaryStream implements BinaryStream {
|
||||
|
@ -33,7 +33,6 @@
|
||||
import java.sql.SQLException;
|
||||
|
||||
import org.hibernate.engine.jdbc.internal.CharacterStreamImpl;
|
||||
import org.hibernate.internal.util.ClassLoaderHelper;
|
||||
import org.hibernate.type.descriptor.java.DataHelper;
|
||||
|
||||
/**
|
||||
@ -211,10 +210,6 @@ public static Clob generateProxy(Reader reader, long length) {
|
||||
* @return The class loader appropriate for proxy construction.
|
||||
*/
|
||||
protected static ClassLoader getProxyClassLoader() {
|
||||
ClassLoader cl = ClassLoaderHelper.getContextClassLoader();
|
||||
if ( cl == null ) {
|
||||
cl = ClobImplementer.class.getClassLoader();
|
||||
}
|
||||
return cl;
|
||||
return ClobImplementer.class.getClassLoader();
|
||||
}
|
||||
}
|
||||
|
@ -27,8 +27,6 @@
|
||||
import java.lang.reflect.Proxy;
|
||||
import java.sql.NClob;
|
||||
|
||||
import org.hibernate.internal.util.ClassLoaderHelper;
|
||||
|
||||
/**
|
||||
* Manages aspects of proxying java.sql.NClobs for non-contextual creation, including proxy creation and
|
||||
* handling proxy invocations. We use proxies here solely to avoid JDBC version incompatibilities.
|
||||
@ -82,10 +80,6 @@ public static NClob generateProxy(Reader reader, long length) {
|
||||
* @return The class loader appropriate for proxy construction.
|
||||
*/
|
||||
protected static ClassLoader getProxyClassLoader() {
|
||||
ClassLoader cl = ClassLoaderHelper.getContextClassLoader();
|
||||
if ( cl == null ) {
|
||||
cl = NClobImplementer.class.getClassLoader();
|
||||
}
|
||||
return cl;
|
||||
return NClobImplementer.class.getClassLoader();
|
||||
}
|
||||
}
|
||||
|
@ -31,7 +31,6 @@
|
||||
import java.sql.Blob;
|
||||
|
||||
import org.hibernate.HibernateException;
|
||||
import org.hibernate.internal.util.ClassLoaderHelper;
|
||||
|
||||
/**
|
||||
* Manages aspects of proxying {@link Blob Blobs} to add serializability.
|
||||
@ -103,10 +102,6 @@ public static Blob generateProxy(Blob blob) {
|
||||
* @return The class loader appropriate for proxy construction.
|
||||
*/
|
||||
public static ClassLoader getProxyClassLoader() {
|
||||
ClassLoader cl = ClassLoaderHelper.getContextClassLoader();
|
||||
if ( cl == null ) {
|
||||
cl = WrappedBlob.class.getClassLoader();
|
||||
}
|
||||
return cl;
|
||||
return WrappedBlob.class.getClassLoader();
|
||||
}
|
||||
}
|
||||
|
@ -31,7 +31,6 @@
|
||||
import java.sql.Clob;
|
||||
|
||||
import org.hibernate.HibernateException;
|
||||
import org.hibernate.internal.util.ClassLoaderHelper;
|
||||
|
||||
/**
|
||||
* Manages aspects of proxying {@link Clob Clobs} to add serializability.
|
||||
@ -102,10 +101,6 @@ public static Clob generateProxy(Clob clob) {
|
||||
* @return The class loader appropriate for proxy construction.
|
||||
*/
|
||||
public static ClassLoader getProxyClassLoader() {
|
||||
ClassLoader cl = ClassLoaderHelper.getContextClassLoader();
|
||||
if ( cl == null ) {
|
||||
cl = WrappedClob.class.getClassLoader();
|
||||
}
|
||||
return cl;
|
||||
return WrappedClob.class.getClassLoader();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user