From a3dbd4538f9f650b92df4707eb4368f0fc70ff73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Csub=C3=A1k?=
 <PeterCsubak@users.noreply.github.com>
Date: Sat, 11 Mar 2017 00:21:34 +0100
Subject: [PATCH] Wrong cast to query and childid propblem fix (#990)

---
 .../io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java  | 4 ++--
 .../io/ebeaninternal/server/persist/DefaultPersister.java     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 93f0e6c39..08ae836cf 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -264,8 +264,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
 
     EbeanServer server = getBeanDescriptor().getEbeanServer();
-    Query<?> q = (Query<?>) server.find(getPropertyType())
-      .where().raw(expr, bindValues.toArray());
+    Query<?> q = server.find(getPropertyType())
+      .where().raw(expr, bindValues.toArray()).query();
 
     return server.findIds(q, t);
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index cc5f4a8f0..31444b024 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -653,7 +653,9 @@ public final class DefaultPersister implements Persister {
             executeSqlUpdate(sqlDelete, t);
           } else {
             List<Object> childIds = expOne.findIdsByParentId(id, idList, t);
-            deleteChildrenById(t, targetDesc, childIds, softDelete);
+            if (childIds != null && !childIds.isEmpty()) {
+              deleteChildrenById(t, targetDesc, childIds, softDelete);
+            }
           }
         }
       }