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

Merge in v4 code changes

Browse Source
This commit is contained in:
Rob Bygrave
2014-04-03 03:47:55 +13:00
parent 38d0e7642e a3c8ed88ca
commit 96e4b4640f
171 changed files with 2747 additions and 3848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+3 -2
View File
@@ -4,6 +4,7 @@ import java.util.Collection;
import com.avaje.ebean.QueryIterator;
import com.avaje.ebean.bean.BeanCollection;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.event.BeanFinder;
import com.avaje.ebeaninternal.api.BeanIdList;
import com.avaje.ebeaninternal.api.SpiQuery;
@@ -82,7 +83,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
BeanDescriptor<T> descriptor = request.getBeanDescriptor();
Collection<T> c = result.getActualDetails();
for (T bean : c) {
descriptor.cachePutBeanData(bean);
descriptor.cachePutBeanData((EntityBean)bean);
}
}
@@ -119,7 +120,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
}
if (result != null && request.isUseBeanCache()){
request.getBeanDescriptor().cachePutBeanData(result);
request.getBeanDescriptor().cachePutBeanData((EntityBean)result);
}
return result;