You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2016/09/12 09:33:28 UTC

svn commit: r1760324 - /jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java

Author: amitj
Date: Mon Sep 12 09:33:27 2016
New Revision: 1760324

URL: http://svn.apache.org/viewvc?rev=1760324&view=rev
Log:
OAK-4790: Compilation error with JDK 6 in FileIOUtils
Removed usage of StandardCharsets.UTF_8

Modified:
    jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java

Modified: jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java?rev=1760324&r1=1760323&r2=1760324&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java (original)
+++ jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java Mon Sep 12 09:33:27 2016
@@ -34,7 +34,6 @@ import com.google.common.base.Function;
 import static com.google.common.collect.Sets.newHashSet;
 import static com.google.common.io.Closeables.close;
 import static com.google.common.io.Files.newWriter;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
 import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
 
@@ -76,7 +75,7 @@ public final class FileIOUtils {
      */
     public static int writeStrings(Iterator<String> iterator, File f, boolean escape)
         throws IOException {
-        BufferedWriter writer =  newWriter(f, UTF_8);
+        BufferedWriter writer =  newWriter(f, Charsets.UTF_8);
         boolean threw = true;
 
         int count = 0;