Merge in v4 code changes

This commit is contained in:
Rob Bygrave
2014-04-03 03:47:55 +13:00
171 changed files with 2747 additions and 3848 deletions
@@ -2,6 +2,7 @@ package com.avaje.ebeaninternal.server.query;
import java.util.List;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
import com.avaje.ebeaninternal.server.deploy.DbReadContext;
@@ -29,7 +30,7 @@ public final class SqlTreeNodeRoot extends SqlTreeNodeBean {
}
@Override
protected void postLoad(DbReadContext cquery, Object loadedBean, Object id, Object lazyLoadParentId) {
protected void postLoad(DbReadContext cquery, EntityBean loadedBean, Object id, Object lazyLoadParentId) {
// set the current bean with id...
cquery.setLoadedBean(loadedBean, id, lazyLoadParentId);