From 87dd786b9a50cbda222711913552a267025e8cc3 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Mon, 26 Nov 2012 17:49:55 -0600 Subject: [PATCH] HHH-7825 - org.hibernate.type.descriptor.java.DataHelper is incompatible with FireBird JDBC (cherry picked from commit caf2ee420c171ad23a4745a6777cf2694de72a5d) --- .../type/descriptor/java/DataHelper.java | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java index 8a17e8a185..60f977bcde 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java @@ -30,6 +30,7 @@ import java.io.Reader; import java.io.StringReader; import java.sql.Clob; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import org.jboss.logging.Logger; @@ -268,26 +269,41 @@ public class DataHelper { /** * Extract the contents of the given Clob as a string. * - * @param reader The reader for the content + * @param value The clob to to be extracted from * * @return The content as string */ public static String extractString(final Clob value) { try { - Reader characterStream = value.getCharacterStream(); - long length = value.length(); - if ( length > Integer.MAX_VALUE ) { - return extractString( characterStream, Integer.MAX_VALUE ); - } - else { - return extractString( characterStream, (int) length ); - } + final Reader characterStream = value.getCharacterStream(); + final long length = determineLengthForBufferSizing( value ); + return length > Integer.MAX_VALUE + ? extractString( characterStream, Integer.MAX_VALUE ) + : extractString( characterStream, (int) length ); } catch ( SQLException e ) { throw new HibernateException( "Unable to access lob stream", e ); } } + /** + * Determine a buffer size for reading the underlying character stream. + * + * @param value The Clob value + * + * @return The appropriate buffer size ({@link java.sql.Clob#length()} by default. + * + * @throws SQLException + */ + private static long determineLengthForBufferSizing(Clob value) throws SQLException { + try { + return value.length(); + } + catch ( SQLFeatureNotSupportedException e ) { + return BUFFER_SIZE; + } + } + /** * Make sure we allocate a buffer sized not bigger than 2048, * not higher than what is actually needed, and at least one. @@ -295,7 +311,7 @@ public class DataHelper { * @param lengthHint the expected size of the full value * @return the buffer size */ - private static final int getSuggestedBufferSize(final int lengthHint) { + private static int getSuggestedBufferSize(final int lengthHint) { return Math.max( 1, Math.min( lengthHint , BUFFER_SIZE ) ); } }