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

fixed issues with merging master

This commit is contained in:
Steve Ebersole 2019-10-17 10:20:52 -05:00
parent 8b500acc1d
commit 9aab0892eb
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/base-information.gradle
View File

@ -8,7 +8,7 @@
apply plugin: 'base' apply plugin: 'base'
ext { ext {
ormVersion = new HibernateVersion( '6.0.0-SNAPSHOT', project ) ormVersion = new HibernateVersion( '6.0.0.BENCHMARK', project )
baselineJavaVersion = '1.8' baselineJavaVersion = '1.8'
jpaVersion = new JpaVersion('2.2') jpaVersion = new JpaVersion('2.2')
} }

2
hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
View File

@ -300,7 +300,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
// if the entity defines a HibernateProxy factory, see if there is an // if the entity defines a HibernateProxy factory, see if there is an
// existing proxy associated with the PC - and if so, use it // 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 PersistenceContext persistenceContext = getPersistenceContext();
final Object proxy = persistenceContext.getProxy( entityKey ); final Object proxy = persistenceContext.getProxy( entityKey );

4
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/QueryScrollingWithInheritanceTest.java
View File

@ -96,7 +96,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction
} }
while ( scrollableResults.next() ) { 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.isPropertyInitialized( employee, "otherEntities" ), is( true ) );
assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) );
if ( "ENG1".equals( employee.getDept() ) ) { if ( "ENG1".equals( employee.getDept() ) ) {
@ -150,7 +150,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction
} }
while ( scrollableResults.next() ) { 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.isPropertyInitialized( employee, "otherEntities" ), is( true ) );
assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) );
if ( "ENG1".equals( employee.getDept() ) ) { if ( "ENG1".equals( employee.getDept() ) ) {

4
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java
View File

@ -97,7 +97,7 @@ public class QueryScrollingWithInheritanceProxyTest extends BaseNonConfigCoreFun
} }
while ( scrollableResults.next() ) { 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.isPropertyInitialized( employee, "otherEntities" ), is( true ) );
assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) );
if ( "ENG1".equals( employee.getDept() ) ) { if ( "ENG1".equals( employee.getDept() ) ) {
@ -161,7 +161,7 @@ public class QueryScrollingWithInheritanceProxyTest extends BaseNonConfigCoreFun
} }
while ( scrollableResults.next() ) { 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.isPropertyInitialized( employee, "otherEntities" ), is( true ) );
assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) );
if ( "ENG1".equals( employee.getDept() ) ) { if ( "ENG1".equals( employee.getDept() ) ) {

4
hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java
View File

@ -90,7 +90,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction
} }
while ( scrollableResults.next() ) { 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.isPropertyInitialized( employee, "otherEntities" ), is( true ) );
assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) );
if ( "ENG1".equals( employee.getDept() ) ) { if ( "ENG1".equals( employee.getDept() ) ) {
@ -154,7 +154,7 @@ public class QueryScrollingWithInheritanceTest extends BaseNonConfigCoreFunction
} }
while ( scrollableResults.next() ) { 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.isPropertyInitialized( employee, "otherEntities" ), is( true ) );
assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) ); assertThat( Hibernate.isInitialized( employee.getOtherEntities() ), is( true ) );
if ( "ENG1".equals( employee.getDept() ) ) { if ( "ENG1".equals( employee.getDept() ) ) {