svn commit: r1795847 - /sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java

[sseifert]

Author: sseifert
Date: Mon May 22 20:41:21 2017
New Revision: 1795847

URL: http://svn.apache.org/viewvc?rev=1795847&view=rev
Log:
SLING-6869 fsresource: Avoid NPE when content fragment file contains invalid 
JSON

Modified:
    
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java

Modified: 
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java?rev=1795847&r1=1795846&r2=1795847&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java
 (original)
+++ 
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java
 Mon May 22 20:41:21 2017
@@ -84,7 +84,7 @@ public final class ContentFile {
             if (subPath == null) {
                 content = rootContent;
             }
-            else {
+            else if (rootContent != null) {
                 content = rootContent.getChild(subPath);
             }
             contentInitialized = true;