This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.fsresource-2.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 893f52717c8395977fd1425ce08f7d7ede3a8371 Author: Stefan Seifert <[email protected]> AuthorDate: Mon May 22 20:41:21 2017 +0000 SLING-6869 fsresource: Avoid NPE when content fragment file contains invalid JSON git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1795847 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/fsprovider/internal/mapper/ContentFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ public final class ContentFile { if (subPath == null) { content = rootContent; } - else { + else if (rootContent != null) { content = rootContent.getChild(subPath); } contentInitialized = true; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
