HHH-6211 - Fix bad pull request merge
This commit is contained in:
parent
6e71657331
commit
66a641df05
|
@ -1,6 +1,6 @@
|
|||
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.Environment;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package org.hibernate.test.cache.ehcache;
|
||||
|
||||
import org.hibernate.cache.EhCacheProvider;
|
||||
import org.hibernate.cache.ReadWriteCache;
|
||||
import org.hibernate.cache.spi.ReadWriteCache.Item;
|
||||
import org.hibernate.cache.internal.EhCacheProvider;
|
||||
import org.hibernate.cfg.Configuration;
|
||||
import org.hibernate.cfg.Environment;
|
||||
|
||||
|
@ -20,8 +20,8 @@ public class EhCacheRegionTest extends EhCacheTest {
|
|||
@Override
|
||||
protected Map getMapFromCacheEntry(final Object entry) {
|
||||
final Map map;
|
||||
if ( entry instanceof ReadWriteCache.Item ) {
|
||||
map = (Map) ( (ReadWriteCache.Item) entry ).getValue();
|
||||
if ( entry instanceof Item ) {
|
||||
map = (Map) ( (Item) entry ).getValue();
|
||||
}
|
||||
else {
|
||||
map = (Map) entry;
|
||||
|
|
Loading…
Reference in New Issue