github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1227 - NPE when using L2 Query cache with findOne() or findOneOrEmpty()

Browse Source
This commit is contained in:
Rob Bygrave
2017-12-13 22:19:25 +13:00
parent e07bd8f736
commit 4a4134ee93
6 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+6 -4
View File
@@ -1104,12 +1104,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
@Override
public boolean isBeanCachePut() {
return beanDescriptor.isBeanCaching() && useBeanCache.isPut();
return useBeanCache.isPut() && beanDescriptor.isBeanCaching();
}
@Override
public boolean isBeanCacheGet() {
return beanDescriptor.isBeanCaching() && useBeanCache.isGet();
return useBeanCache.isGet() && beanDescriptor.isBeanCaching() ;
}
@Override
@@ -1118,9 +1118,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
}
@Override
public void resetBeanCacheAutoMode() {
public void resetBeanCacheAutoMode(boolean findOne) {
if (useBeanCache == CacheMode.AUTO) {
useBeanCache = CacheMode.OFF;
if (!findOne || useQueryCache != CacheMode.OFF) {
useBeanCache = CacheMode.OFF;
}
}
}