commit ea21a93caf53329a30960e179202490fbd43ead4
author Dominik Suess <suess@adobe.com> Tue Nov 06 17:21:38 2018 +0100
committer Dominik Suess <suess@adobe.com> Tue Nov 06 17:21:38 2018 +0100
tree 23832607d73abfe15738885f4da6502fa9878828
parent 2844775991b5af7ce1fef5ad4991a16e5cecb546

SLING-8077 - fixing flawed patch of null scenario - scenario to be covered is a missing extension in target that exists in source - so extension needs to be added to target.

src/main/java/org/apache/sling/feature/extension/content/ContentOrderMergeProcessor.java

diff --git a/src/main/java/org/apache/sling/feature/extension/content/ContentOrderMergeProcessor.java b/src/main/java/org/apache/sling/feature/extension/content/ContentOrderMergeProcessor.java
index c2df12f..05b1133 100644
--- a/src/main/java/org/apache/sling/feature/extension/content/ContentOrderMergeProcessor.java
+++ b/src/main/java/org/apache/sling/feature/extension/content/ContentOrderMergeProcessor.java
@@ -51,7 +51,8 @@
 
     @Override
     public void merge(HandlerContext context, Feature target, Feature source, Extension targetEx, Extension sourceEx) {
-        if (target == null) {
+        if (targetEx == null) {
+            target.getExtensions().add(sourceEx);
             return;
         }
         processFeature(context, target, targetEx);