[sling-org-apache-sling-feature-extension-content] 17/46: SLING-8077 - returning on null target (based on feedback by @bosschaer)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-content.git

commit 2844775991b5af7ce1fef5ad4991a16e5cecb546
Author: Dominik Suess <su...@adobe.com>
AuthorDate: Tue Nov 6 14:21:40 2018 +0100

    SLING-8077 - returning on null target (based on feedback by @bosschaer)
---
 .../sling/feature/extension/content/ContentOrderMergeProcessor.java    | 3 +++
 1 file changed, 3 insertions(+)

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 061ce24..c2df12f 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,6 +51,9 @@ public class ContentOrderMergeProcessor implements MergeHandler {
 
     @Override
     public void merge(HandlerContext context, Feature target, Feature source, Extension targetEx, Extension sourceEx) {
+        if (target == null) {
+            return;
+        }
         processFeature(context, target, targetEx);
         processFeature(context, source, sourceEx);
         for (final Artifact a : sourceEx.getArtifacts()) {