commit 41394c6e88d9e5d7b99cb89840a32c073bec8ed7
author Stefan Seifert <sseifert@apache.org> Mon May 22 20:41:21 2017 +0000
committer Stefan Seifert <sseifert@apache.org> Mon May 22 20:41:21 2017 +0000
tree ebc4a67296e16055cd5016ebd03b644b5bc3c572
parent 5077302b6a48122dbf0f6779269533c11f4f7de4

SLING-6869 fsresource: Avoid NPE when content fragment file contains invalid JSON

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1795847 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java

diff --git a/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java b/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java
index dd31346..184d184 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java
@@ -84,7 +84,7 @@
             if (subPath == null) {
                 content = rootContent;
             }
-            else {
+            else if (rootContent != null) {
                 content = rootContent.getChild(subPath);
             }
             contentInitialized = true;