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

HHH-12118 Removing handling of old JVM_HAS_TIMESTAMP_BUG

This commit is contained in:
Sanne Grinovero 2017-11-17 12:37:23 +01:00 committed by Steve Ebersole
parent 29d5b41700
commit 65e44267d6
5 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
View File

@ -8,7 +8,6 @@ package org.hibernate.cfg;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@ -156,7 +155,6 @@ public final class Environment implements AvailableSettings {
private static final BytecodeProvider BYTECODE_PROVIDER_INSTANCE;
private static final boolean ENABLE_BINARY_STREAMS;
private static final boolean ENABLE_REFLECTION_OPTIMIZER;
private static final boolean JVM_HAS_TIMESTAMP_BUG;
private static final Properties GLOBAL_PROPERTIES;
@ -238,31 +236,12 @@ public final class Environment implements AvailableSettings {
}
BYTECODE_PROVIDER_INSTANCE = buildBytecodeProvider( GLOBAL_PROPERTIES );
long x = 123456789;
JVM_HAS_TIMESTAMP_BUG = new Timestamp(x).getTime() != x;
if ( JVM_HAS_TIMESTAMP_BUG ) {
LOG.usingTimestampWorkaround();
}
}
public static BytecodeProvider getBytecodeProvider() {
return BYTECODE_PROVIDER_INSTANCE;
}
/**
* Does this JVM's implementation of {@link java.sql.Timestamp} have a bug in which the following is true:<code>
* new java.sql.Timestamp( x ).getTime() != x
* </code>
* <p/>
* NOTE : IBM JDK 1.3.1 the only known JVM to exhibit this behavior.
*
* @return True if the JVM's {@link Timestamp} implementa
*/
public static boolean jvmHasTimestampBug() {
return JVM_HAS_TIMESTAMP_BUG;
}
/**
* Should we use streams to bind binary types to JDBC IN parameters?
*

4
hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
View File

@ -1433,10 +1433,6 @@ public interface CoreMessageLogger extends BasicLogger {
@Message(value = "Using java.io streams to persist binary types", id = 407)
void usingStreams();
@LogMessage(level = INFO)
@Message(value = "Using workaround for JVM bug in java.sql.Timestamp", id = 408)
void usingTimestampWorkaround();
@LogMessage(level = WARN)
@Message(value = "Using %s which does not generate IETF RFC 4122 compliant UUID values; consider using %s instead",
id = 409)

12
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateTypeDescriptor.java
View File

@ -11,7 +11,6 @@ import java.util.Comparator;
import java.util.Date;
import java.util.GregorianCalendar;
import org.hibernate.cfg.Environment;
import org.hibernate.internal.util.compare.CalendarComparator;
import org.hibernate.type.descriptor.WrapperOptions;
@ -101,16 +100,7 @@ public class CalendarDateTypeDescriptor extends AbstractTypeDescriptor<Calendar>
}
Calendar cal = new GregorianCalendar();
if ( Environment.jvmHasTimestampBug() ) {
final long milliseconds = ( (Date) value ).getTime();
final long nanoseconds = java.sql.Timestamp.class.isInstance( value )
? ( (java.sql.Timestamp) value ).getNanos()
: 0;
cal.setTime( new Date( milliseconds + nanoseconds / 1000000 ) );
}
else {
cal.setTime( (Date) value );
}
cal.setTime( (Date) value );
return cal;
}
}

11
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java
View File

@ -101,16 +101,7 @@ public class CalendarTimeTypeDescriptor extends AbstractTypeDescriptor<Calendar>
}
Calendar cal = new GregorianCalendar();
if ( Environment.jvmHasTimestampBug() ) {
final long milliseconds = ( (Date) value ).getTime();
final long nanoseconds = java.sql.Timestamp.class.isInstance( value )
? ( (java.sql.Timestamp) value ).getNanos()
: 0;
cal.setTime( new Date( milliseconds + nanoseconds / 1000000 ) );
}
else {
cal.setTime( (Date) value );
}
cal.setTime( (Date) value );
return cal;
}
}

11
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java
View File

@ -117,16 +117,7 @@ public class CalendarTypeDescriptor extends AbstractTypeDescriptor<Calendar> {
}
Calendar cal = new GregorianCalendar();
if ( Environment.jvmHasTimestampBug() ) {
final long milliseconds = ( (java.util.Date) value ).getTime();
final long nanoseconds = java.sql.Timestamp.class.isInstance( value )
? ( (java.sql.Timestamp) value ).getNanos()
: 0;
cal.setTime( new Date( milliseconds + nanoseconds / 1000000 ) );
}
else {
cal.setTime( (java.util.Date) value );
}
cal.setTime( (java.util.Date) value );
return cal;
}
}