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

HHH-10614 - Auto evict collection cache throws exception with null values

This commit is contained in:
Janario Oliveira 2016-03-14 14:06:34 -03:00 committed by Vlad Mihalcea
parent 0ed39c7746
commit 732abea8e5
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java vendored
View File

@ -119,17 +119,11 @@ public class CollectionCacheInvalidator
if ( oldState != null ) {
// in case of updating an entity we perhaps have to decache 2 entity collections, this is the
// old one
oldId = session.getIdentifier( oldState[i] );
oldId = getIdentifier( session, oldState[i] );
}
Object ref = persister.getPropertyValue( entity, i );
Serializable id = null;
if ( ref != null ) {
id = session.getContextEntityIdentifier( ref );
if ( id == null ) {
id = session.getSessionFactory().getClassMetadata( ref.getClass() )
.getIdentifier( ref, session );
}
}
Serializable id = getIdentifier( session, ref );
// only evict if the related entity has changed
if ( id != null && !id.equals( oldId ) ) {
evict( id, collectionPersister, session );
@ -159,6 +153,18 @@ public class CollectionCacheInvalidator
}
}
private Serializable getIdentifier(EventSource session, Object obj) {
Serializable id = null;
if ( obj != null ) {
id = session.getContextEntityIdentifier( obj );
if ( id == null ) {
id = session.getSessionFactory().getClassMetadata( obj.getClass() )
.getIdentifier( obj, session );
}
}
return id;
}
private void evict(Serializable id, CollectionPersister collectionPersister, EventSource session) {
if ( LOG.isDebugEnabled() ) {
LOG.debug( "Evict CollectionRegion " + collectionPersister.getRole() + " for id " + id );

20
hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionTest.java vendored
View File

@ -283,4 +283,24 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase {
}
s.close();
}
@Test
public void testUpdateWithNullRelation() {
Session session = openSession();
session.beginTransaction();
User user = new User();
user.setName( "User1" );
session.persist( user );
session.getTransaction().commit();
session.close();
session = openSession();
session.beginTransaction();
user.setName( "UserUpdate" );
session.merge( user );
session.getTransaction().commit();
session.close();
}
}