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

HHH-6211 - Fix bad pull request merge

This commit is contained in:
Steve Ebersole 2011-05-09 10:07:18 -05:00
parent 6e71657331
commit 66a641df05
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java vendored
View File

@ -1,6 +1,6 @@
package org.hibernate.test.cache.ehcache; package org.hibernate.test.cache.ehcache;
import org.hibernate.cache.EhCacheRegionFactory; import org.hibernate.cache.internal.EhCacheRegionFactory;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;

8
hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java vendored
View File

@ -1,7 +1,7 @@
package org.hibernate.test.cache.ehcache; package org.hibernate.test.cache.ehcache;
import org.hibernate.cache.EhCacheProvider; import org.hibernate.cache.spi.ReadWriteCache.Item;
import org.hibernate.cache.ReadWriteCache; import org.hibernate.cache.internal.EhCacheProvider;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
@ -20,8 +20,8 @@ public class EhCacheRegionTest extends EhCacheTest {
@Override @Override
protected Map getMapFromCacheEntry(final Object entry) { protected Map getMapFromCacheEntry(final Object entry) {
final Map map; final Map map;
if ( entry instanceof ReadWriteCache.Item ) { if ( entry instanceof Item ) {
map = (Map) ( (ReadWriteCache.Item) entry ).getValue(); map = (Map) ( (Item) entry ).getValue();
} }
else { else {
map = (Map) entry; map = (Map) entry;