Peter Centgraf pushed to branch feature/REPO-1817 at cms-community /
hippo-repository
Commits:
4c163c70 by Peter Centgraf at 2017-09-14T13:51:09+02:00
REPO-1817 small fix for delete case of DefinitionMergeService.recursiveCopy
- - - - -
1 changed file:
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
Changes:
=====================================
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
=====================================
---
a/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
@@ -1165,7 +1165,7 @@ public class DefinitionMergeService {
if (from.isDelete()) {
// delete clears everything, so there's no point continuing with
other properties or recursion
to.delete();
- return emptyList();
+ return newDefs;
}
to.setOrderBefore(from.getOrderBefore());
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/4c163c70f739414844338bab1c18fe76bcd88e92
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/4c163c70f739414844338bab1c18fe76bcd88e92
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
