Alon Bar-Lev has uploaded a new change for review.
Change subject: utils: cleanup: LocalConfig: fix defect: Found reliance on
default encoding: new java.io.FileReader(File)
......................................................................
utils: cleanup: LocalConfig: fix defect: Found reliance on default encoding:
new java.io.FileReader(File)
Funny! This object, FileReader, does not support encoding while its base
class does.
Change-Id: I89b4009f37256110a10b97b1d1c1b273b07e6a86
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java
1 file changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/19236/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java
index 4c1bb4b..003b1d9 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java
@@ -2,9 +2,11 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -148,10 +150,10 @@
}
// Load the file:
- BufferedReader reader = null;
int index = 0;
- try {
- reader = new BufferedReader(new FileReader(file));
+ try (
+ BufferedReader reader = new BufferedReader(new
InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")))
+ ) {
String line = null;
while ((line = reader.readLine()) != null) {
index++;
@@ -168,16 +170,6 @@
);
log.error(msg, e);
throw new RuntimeException(msg, e);
- }
- finally {
- if (reader != null) {
- try {
- reader.close();
- }
- catch (IOException exception) {
- log.error("Can't close file \"" + file.getAbsolutePath() +
"\".", exception);
- }
- }
}
}
--
To view, visit http://gerrit.ovirt.org/19236
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89b4009f37256110a10b97b1d1c1b273b07e6a86
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
