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 9c02fceda346af3f86d62bceb37660362d6d3b67 Author: Dominik Suess <[email protected]> AuthorDate: Mon Nov 12 16:53:06 2018 +0100 SLING-8099 - eliminating NPE condition --- .../sling/feature/extension/content/ContentOrderMergeProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9289e4c..82ad7db 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 @@ -30,7 +30,7 @@ public class ContentOrderMergeProcessor implements MergeHandler { public static final String DEFAULT_CONTENT_START_ORDER = "default.content.startorder"; private void processFeature(Feature feature, Extension extension) { - if (feature == null) { + if (feature == null || extension == null) { return; } String defaultOrder = feature.getVariables().get(DEFAULT_CONTENT_START_ORDER);
