From d8f4503d98138bc61c87eade9091e4bad92589c7 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 5 Jan 2021 17:56:55 +1300 Subject: [PATCH] #2141 - Fix for failing test, revert of fix for #2127 --- .../java/io/ebeaninternal/server/persist/SaveManyBeans.java | 6 +++--- .../test/java/org/tests/cascade/TestDeleteO2MOrphans.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 70131db88..183956ef8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -349,9 +349,9 @@ public class SaveManyBeans extends SaveManyBase { return; } if (!(value instanceof BeanCollection)) { - if (!insertedParent && cascade && hasNewOrDirtyBeans()) { - persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0); - } +// if (!insertedParent && cascade && hasNewOrDirtyBeans()) { +// persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0); +// } } else { BeanCollection c = (BeanCollection) value; Set modifyRemovals = c.getModifyRemovals(); diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java index f4356d2bf..468187657 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java @@ -19,7 +19,8 @@ public class TestDeleteO2MOrphans extends BaseTestCase { // assert COOne check = findById(id); - assertThat(check.getChildren()).hasSize(2); + //FIXME #2127 #2141: assertThat(check.getChildren()).hasSize(2); + assertThat(check.getChildren()).hasSize(4); DB.delete(check); }