From 9aab0892eb9c7c51b1ccfd740cb0155a42fd38b0 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 17 Oct 2019 10:20:52 -0500 Subject: [PATCH] fixed issues with merging master --- gradle/base-information.gradle | 2 +- .../java/org/hibernate/internal/StatelessSessionImpl.java | 2 +- .../enhancement/lazy/QueryScrollingWithInheritanceTest.java | 4 ++-- .../lazy/proxy/QueryScrollingWithInheritanceProxyTest.java | 4 ++-- .../hqlfetchscroll/QueryScrollingWithInheritanceTest.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/base-information.gradle b/gradle/base-information.gradle index d75e7908b5..e67d0979db 100644 --- a/gradle/base-information.gradle +++ b/gradle/base-information.gradle @@ -8,7 +8,7 @@ apply plugin: 'base' ext { - ormVersion = new HibernateVersion( '6.0.0-SNAPSHOT', project ) + ormVersion = new HibernateVersion( '6.0.0.BENCHMARK', project ) baselineJavaVersion = '1.8' jpaVersion = new JpaVersion('2.2') } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java index 566cc2db46..414eac9ae5 100755 --- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java @@ -300,7 +300,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen // if the entity defines a HibernateProxy factory, see if there is an // existing proxy associated with the PC - and if so, use it - if ( persister.getEntityMetamodel().getTuplizer().getProxyFactory() != null ) { + if ( persister.getRepresentationStrategy().getProxyFactory() != null ) { final PersistenceContext persistenceContext = getPersistenceContext(); final Object proxy = persistenceContext.getProxy( entityKey ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/QueryScrollingWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/QueryScrollingWithInheritanceTest.java index e9be4a677e..ada33a34e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/QueryScrollingWithInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/QueryScrollingWithInheritanceTest.java @@ -96,7 +96,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction } while ( scrollableResults.next() ) { - final Employee employee = (Employee) scrollableResults.get( 0 ); + final Employee employee = (Employee) scrollableResults.get(); assertThat( Hibernate.isPropertyInitialized( employee, "otherEntities" ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); if ( "ENG1".equals( employee.getDept() ) ) { @@ -150,7 +150,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction } while ( scrollableResults.next() ) { - final Employee employee = (Employee) scrollableResults.get( 0 ); + final Employee employee = (Employee) scrollableResults.get(); assertThat( Hibernate.isPropertyInitialized( employee, "otherEntities" ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); if ( "ENG1".equals( employee.getDept() ) ) { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java index 680bf1b702..d0e93b67e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java @@ -97,7 +97,7 @@ public class QueryScrollingWithInheritanceProxyTest extends BaseNonConfigCoreFun } while ( scrollableResults.next() ) { - final Employee employee = (Employee) scrollableResults.get( 0 ); + final Employee employee = (Employee) scrollableResults.get(); assertThat( Hibernate.isPropertyInitialized( employee, "otherEntities" ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); if ( "ENG1".equals( employee.getDept() ) ) { @@ -161,7 +161,7 @@ public class QueryScrollingWithInheritanceProxyTest extends BaseNonConfigCoreFun } while ( scrollableResults.next() ) { - final Employee employee = (Employee) scrollableResults.get( 0 ); + final Employee employee = (Employee) scrollableResults.get(); assertThat( Hibernate.isPropertyInitialized( employee, "otherEntities" ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); if ( "ENG1".equals( employee.getDept() ) ) { diff --git a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java index 1007a8c711..4ae03d7153 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java @@ -90,7 +90,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction } while ( scrollableResults.next() ) { - final Employee employee = (Employee) scrollableResults.get( 0 ); + final Employee employee = (Employee) scrollableResults.get(); assertThat( Hibernate.isPropertyInitialized( employee, "otherEntities" ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); if ( "ENG1".equals( employee.getDept() ) ) { @@ -154,7 +154,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction } while ( scrollableResults.next() ) { - final Employee employee = (Employee) scrollableResults.get( 0 ); + final Employee employee = (Employee) scrollableResults.get(); assertThat( Hibernate.isPropertyInitialized( employee, "otherEntities" ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); if ( "ENG1".equals( employee.getDept() ) ) {