diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java index f3ab9fea5..f9b11d325 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java @@ -14,9 +14,7 @@ public abstract class DLoadBaseContext { protected final DLoadContext parent; protected final BeanDescriptor desc; - - protected final String path; - + protected final String fullPath; protected final OrmQueryProperties queryProps; @@ -40,7 +38,6 @@ public abstract class DLoadBaseContext { this.serverName = parent.getEbeanServer().getName(); this.desc = desc; this.queryProps = queryProps; - this.path = path; this.fullPath = parent.getFullPath(path); this.hitCache = !parent.isExcludeBeanCache() && desc.isBeanCaching(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java index b79bacfe7..ffe558ba8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -91,9 +91,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex if (bufferList != null) { for (LoadBuffer loadBuffer : bufferList) { if (!loadBuffer.list.isEmpty()) { - boolean loadCache = false; - LoadBeanRequest req = new LoadBeanRequest(loadBuffer, parentRequest, false, null, loadCache); - + LoadBeanRequest req = new LoadBeanRequest(loadBuffer, parentRequest, false, null, false); parent.getEbeanServer().loadBean(req); if (!queryProps.isQueryFetchAll()) { // Stop - only fetch the first batch ... the rest will be lazy loaded diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java deleted file mode 100644 index b88dff6dd..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.avaje.ebeaninternal.server.loadcontext; - -import java.util.List; - -public interface DLoadList { - - int add(T e); - - /** - * Return the next batch of entries from the top. - */ - List getNextBatch(int batchSize); - - void removeEntry(int position); - - /** - * Return the batch of entries based on the position and batch size. - */ - List getLoadBatch(int position, int batchSize); - -} \ No newline at end of file