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

HHH-10795 : Corrections due to backporting 

(cherry picked from commit 71d799ae11)
This commit is contained in:
Gail Badner 2016-07-25 12:56:24 -07:00
parent 482515ba13
commit 20dd7fbfbf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTestTask.java
View File

@ -11,7 +11,7 @@ import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.spi.ManagedEntity;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
import static org.junit.Assert.assertEquals;
@ -66,7 +66,7 @@ public class OtherEntityEntryContextTestTask extends AbstractEnhancerTestTask {
assertFalse( s2.contains( p ) );
assertNull( ( (SharedSessionContractImplementor) s2 ).getPersistenceContext().getEntry( p ) );
assertNull( ( (SessionImplementor) s2 ).getPersistenceContext().getEntry( p ) );
try {
s2.update( p );

10
hibernate-core/src/test/java/org/hibernate/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java vendored
View File

@ -15,7 +15,7 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.spi.EntityEntry;
import org.hibernate.engine.spi.ManagedEntity;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.engine.spi.Status;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.testing.TestForIssue;
@ -129,11 +129,11 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio
assertSame(
myReferenceData.$$_hibernate_getEntityEntry(),
( (SharedSessionContractImplementor) s1 ).getPersistenceContext().getEntry( myReferenceData )
( (SessionImplementor) s1 ).getPersistenceContext().getEntry( myReferenceData )
);
assertSame(
myOtherReferenceData.$$_hibernate_getEntityEntry(),
( (SharedSessionContractImplementor) s1 ).getPersistenceContext().getEntry( myOtherReferenceData )
( (SessionImplementor) s1 ).getPersistenceContext().getEntry( myOtherReferenceData )
);
Session s2 = openSession();
@ -143,8 +143,8 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio
assertFalse( s2.contains( myReferenceData ) );
assertFalse( s2.contains( myOtherReferenceData ) );
assertNull( ( (SharedSessionContractImplementor) s2 ).getPersistenceContext().getEntry( myReferenceData ) );
assertNull( ( (SharedSessionContractImplementor) s2 ).getPersistenceContext().getEntry( myOtherReferenceData ) );
assertNull( ( (SessionImplementor) s2 ).getPersistenceContext().getEntry( myReferenceData ) );
assertNull( ( (SessionImplementor) s2 ).getPersistenceContext().getEntry( myOtherReferenceData ) );
// evict should do nothing, since p is not associated with s2
s2.evict( myReferenceData );