Author: sseifert Date: Mon May 22 20:41:39 2017 New Revision: 1795848 URL: http://svn.apache.org/viewvc?rev=1795848&view=rev Log: SLING-6869 fsresource: Avoid NPE when content fragment file contains invalid JSON
Modified: sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java Modified: sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java?rev=1795848&r1=1795847&r2=1795848&view=diff ============================================================================== --- sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java (original) +++ sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java Mon May 22 20:41:39 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;