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/CQueryEngine.java
+3 -2
View File
@@ -10,6 +10,7 @@ import com.avaje.ebean.BackgroundExecutor;
import com.avaje.ebean.QueryIterator;
import com.avaje.ebean.bean.BeanCollection;
import com.avaje.ebean.bean.BeanCollectionTouched;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.bean.ObjectGraphNode;
import com.avaje.ebean.config.dbplatform.DatabasePlatform;
import com.avaje.ebeaninternal.api.BeanIdList;
@@ -226,7 +227,7 @@ public class CQueryEngine {
*/
public <T> T find(OrmQueryRequest<T> request) {
T bean = null;
EntityBean bean = null;
CQuery<T> cquery = queryBuilder.buildQuery(request);
@@ -247,7 +248,7 @@ public class CQueryEngine {
request.executeSecondaryQueries(defaultSecondaryQueryBatchSize);
return bean;
return (T)bean;
} catch (SQLException e) {
throw cquery.createPersistenceException(e);