commit 9c02fceda346af3f86d62bceb37660362d6d3b67
author Dominik Suess <suess@adobe.com> Mon Nov 12 16:53:06 2018 +0100
committer Dominik Suess <suess@adobe.com> Mon Nov 12 16:53:06 2018 +0100
tree 46cf45dd763e1f907baf3316fb870c4dfd76d6a3
parent cbbce548889b273577d23c2b597434ba5d576081

SLING-8099 - eliminating NPE condition

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 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 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);