svn commit: r1786878 - /sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java

[sseifert]

Author: sseifert
Date: Tue Mar 14 10:59:07 2017
New Revision: 1786878

URL: http://svn.apache.org/viewvc?rev=1786878&view=rev
Log:
SLING-6440 switch to latest jcr/contentparser API

Modified:
    
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java

Modified: 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java?rev=1786878&r1=1786877&r2=1786878&view=diff
==============================================================================
--- 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
 (original)
+++ 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
 Tue Mar 14 10:59:07 2017
@@ -22,7 +22,10 @@ import static org.apache.jackrabbit.vaul
 import static 
org.apache.sling.fsprovider.internal.parser.ContentFileTypes.JCR_XML_SUFFIX;
 import static 
org.apache.sling.fsprovider.internal.parser.ContentFileTypes.JSON_SUFFIX;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
@@ -68,10 +71,10 @@ class ContentFileParserUtil {
         }
         try {
             if (StringUtils.endsWith(file.getName(), JSON_SUFFIX)) {
-                return JSON_PARSER.parse(file);
+                return parse(JSON_PARSER, file);
             }
             else if (StringUtils.equals(file.getName(), DOT_CONTENT_XML) || 
StringUtils.endsWith(file.getName(), JCR_XML_SUFFIX)) {
-                return JCR_XML_PARSER.parse(file);
+                return parse(JCR_XML_PARSER, file);
             }
         }
         catch (Throwable ex) {
@@ -80,4 +83,11 @@ class ContentFileParserUtil {
         return null;
     }
 
+    private static Map<String,Object> parse(ContentParser contentParser, File 
file) throws IOException {
+        try (FileInputStream fis = new FileInputStream(file);
+                BufferedInputStream bis = new BufferedInputStream(fis)) {
+            return contentParser.parse(bis);
+        }
+    }
+    
 }