Oscar Scholten pushed to branch master at cms-community /
hippo-configuration-management
Commits:
4c7e311d by Oscar Scholten at 2017-08-21T11:36:12+02:00
HCM-193 Fix esv2yaml to not inject residual category in content
- - - - -
1 changed file:
-
migration/src/main/java/org/onehippo/cm/migration/SourceInitializeInstruction.java
Changes:
=====================================
migration/src/main/java/org/onehippo/cm/migration/SourceInitializeInstruction.java
=====================================
---
a/migration/src/main/java/org/onehippo/cm/migration/SourceInitializeInstruction.java
+++
b/migration/src/main/java/org/onehippo/cm/migration/SourceInitializeInstruction.java
@@ -365,7 +365,7 @@ public class SourceInitializeInstruction extends
ContentInitializeInstruction {
// Check if we need to inject .meta:residual-child-node-category for
this node. If so, the call to
// "registerInjectResidualCategoryPath" ensures that "isContent" will
later return true for its child nodes.
- if (newNode) {
+ if (newNode && !isContent(defNode.getPath())) {
final ConfigurationItemCategory category =
getInjectResidualCategoryMatchers().getMatch(
defNode.getPath(), getStringPropertyValue(defNode,
JCR_PRIMARYTYPE));
if (category != null) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-configuration-management/commit/4c7e311de709eb23ecb4dc6785d622fe68dc2a15
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-configuration-management/commit/4c7e311de709eb23ecb4dc6785d622fe68dc2a15
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
[email protected]
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
