Last two high priority findbugs errors
Change-Id: I180d9156b49c79980f2b2361ec062e5c1cda64a8
diff --git a/utils/misc/src/main/java/org/onlab/util/Tools.java b/utils/misc/src/main/java/org/onlab/util/Tools.java
index 3a0e926..b6a76d0 100644
--- a/utils/misc/src/main/java/org/onlab/util/Tools.java
+++ b/utils/misc/src/main/java/org/onlab/util/Tools.java
@@ -15,18 +15,20 @@
*/
package org.onlab.util;
-import com.google.common.base.Strings;
-import com.google.common.primitives.UnsignedLongs;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ThreadFactory;
+import com.google.common.base.Strings;
+import com.google.common.primitives.UnsignedLongs;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
public abstract class Tools {
private Tools() {
@@ -94,7 +96,10 @@
* @return file contents
*/
public static List<String> slurp(File path) {
- try (BufferedReader br = new BufferedReader(new FileReader(path))) {
+ try {
+ BufferedReader br = new BufferedReader(
+ new InputStreamReader(new FileInputStream(path), StandardCharsets.UTF_8));
+
List<String> lines = new ArrayList<>();
String line;
while ((line = br.readLine()) != null) {