From 3b7f5496a8ae4bba588d95bc3a5dadcd3bc8b1e2 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 11 Jul 2016 12:28:31 +1200
Subject: [PATCH] #767 - Query.setDisableLazyLoading(true) ... not disabling
 lazy loading on @OneToMany

---
 .../com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java  | 3 ++-
 .../com/avaje/tests/batchload/TestQueryJoinToAssocOne.java     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java
index b41467ca5..9a78a3e40 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -374,7 +374,8 @@ public class SqlTreeNodeBean implements SqlTreeNode {
         if (ref != null) {
           if (disableLazyLoad) {
             ref.setDisableLazyLoad(true);
-          } else if (!ref.isRegisteredWithLoadContext()) {
+          }
+          if (!ref.isRegisteredWithLoadContext()) {
             ctx.register(manys[i].getName(), ref);
           }
         }
diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
index 864e18cd0..da78d2485 100644
--- a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
+++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
@@ -94,6 +94,9 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
     // normally invokes lazy loading
     orderDetail.getShipQty();
 
+    // normally invokes lazy loading
+    order.getShipments().size();
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(2);