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

HHH-9975 CacheImpl.containsQuery(String) does not check if query cache is enabled

This commit is contained in:
Brett Meyer 2015-08-26 16:37:09 -04:00
parent c66dba9799
commit 5016f208ba
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java
View File

@ -6,12 +6,6 @@
*/ */
package org.hibernate.internal; package org.hibernate.internal;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.boot.spi.SessionFactoryOptions;
import org.hibernate.cache.spi.QueryCache; import org.hibernate.cache.spi.QueryCache;
@ -27,6 +21,12 @@ import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.pretty.MessageHelper; import org.hibernate.pretty.MessageHelper;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/** /**
* @author Strong Liu <stliu@hibernate.org> * @author Strong Liu <stliu@hibernate.org>
*/ */
@ -200,7 +200,11 @@ public class CacheImpl implements CacheImplementor {
@Override @Override
public boolean containsQuery(String regionName) { public boolean containsQuery(String regionName) {
return queryCaches.containsKey( regionName ); if ( sessionFactory.getSessionFactoryOptions().isQueryCacheEnabled() ) {
return queryCaches.containsKey(regionName);
} else {
return false;
}
} }
@Override @Override