HHH-10664 - Prep 5.2 feature branch

hibernate · May 6, 2016 · 8c91520 · 8c91520
1 parent 69c8ef2
commit 8c91520
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -146,8 +146,6 @@ subprojects { subProject ->
 		testRuntime( libraries.hsqldb )
 		testRuntime( libraries.postgresql )
 		testRuntime( libraries.mysql )
-		testRuntime( libraries.oracle )
-		testRuntime( libraries.mssql )
 		testRuntime( libraries.mariadb )
 		testRuntime( libraries.woodstox )
 

diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
@@ -22,7 +22,7 @@
 import org.hibernate.engine.spi.CascadingActions;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityKey;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.RefreshEvent;
 import org.hibernate.event.spi.RefreshEventListener;
@@ -157,7 +157,7 @@ public void onRefresh(RefreshEvent event, Map refreshedAlready) {
 			final SoftLock lock = cache.lockItem( source, ck, previousVersion );
 			source.getActionQueue().registerProcess( new AfterTransactionCompletionProcess() {
 				@Override
-				public void doAfterTransactionCompletion(boolean success, SessionImplementor session) {
+				public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session) {
 					cache.unlockItem( session, ck, lock );
 				}
 			} );
@@ -194,7 +194,7 @@ private void evictCachedCollections(Type[] types, Serializable id, EventSource s
 			throws HibernateException {
 		for ( Type type : types ) {
 			if ( type.isCollectionType() ) {
-				CollectionPersister collectionPersister = source.getFactory().getCollectionPersister( ( (CollectionType) type ).getRole() );
+				CollectionPersister collectionPersister = source.getFactory().getMetamodel().collectionPersister( ( (CollectionType) type ).getRole() );
 				if ( collectionPersister.hasCache() ) {
 					final CollectionRegionAccessStrategy cache = collectionPersister.getCacheAccessStrategy();
 					final Object ck = cache.generateCacheKey(
@@ -206,7 +206,7 @@ private void evictCachedCollections(Type[] types, Serializable id, EventSource s
 					final SoftLock lock = cache.lockItem( source, ck, null );
 					source.getActionQueue().registerProcess( new AfterTransactionCompletionProcess() {
 						@Override
-						public void doAfterTransactionCompletion(boolean success, SessionImplementor session) {
+						public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session) {
 							cache.unlockItem( session, ck, lock );
 						}
 					} );