You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2017/06/14 09:17:25 UTC
oozie git commit: OOZIE-2938 Fix Findbugs warnings in
oozie-sharelib-hive module (Jan Hentschel via gezapeti)
Repository: oozie
Updated Branches:
refs/heads/master 8d710142a -> 62ccfdbab
OOZIE-2938 Fix Findbugs warnings in oozie-sharelib-hive module (Jan Hentschel via gezapeti)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/62ccfdba
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/62ccfdba
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/62ccfdba
Branch: refs/heads/master
Commit: 62ccfdbabb27ee4315f5ef4cb1975f4232265297
Parents: 8d71014
Author: Gezapeti Cseh <ge...@gmail.com>
Authored: Wed Jun 14 11:17:21 2017 +0200
Committer: Gezapeti Cseh <ge...@gmail.com>
Committed: Wed Jun 14 11:17:21 2017 +0200
----------------------------------------------------------------------
release-log.txt | 1 +
.../java/org/apache/oozie/action/hadoop/HiveMain.java | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/62ccfdba/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index bc4c82c..6b1c2f6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.0.0 release (trunk - unreleased)
+OOZIE-2938 Fix Findbugs warnings in oozie-sharelib-hive module (Jan Hentschel via gezapeti)
OOZIE-2939 Fix Findbugs warnings related to reliance on default encoding in oozie-sharelib-hive2 module (Jan Hentschel via gezapeti)
OOZIE-2935 Fix "concatenates strings using + in a loop" Findbugs error in oozie-sharelib-streaming (Jan Hentschel via rkanter)
OOZIE-2825 Custom Authentication doc page is not well formatted (Jan Hentschel via rkanter)
http://git-wip-us.apache.org/repos/asf/oozie/blob/62ccfdba/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
----------------------------------------------------------------------
diff --git a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
index 1f88c85..7b152f2 100644
--- a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
+++ b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
@@ -20,11 +20,11 @@ package org.apache.oozie.action.hadoop;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -181,9 +181,9 @@ public class HiveMain extends LauncherMain {
Configuration hiveConf = initActionConf();
// Write the action configuration out to hive-site.xml
- OutputStream os = new FileOutputStream(HIVE_SITE_CONF);
- hiveConf.writeXml(os);
- os.close();
+ try (OutputStream os = new FileOutputStream(HIVE_SITE_CONF)) {
+ hiveConf.writeXml(os);
+ }
System.out.println();
System.out.println("Hive Configuration Properties:");
@@ -333,7 +333,7 @@ public class HiveMain extends LauncherMain {
String line;
BufferedReader br = null;
try {
- br = new BufferedReader(new FileReader(filePath));
+ br = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), "UTF-8"));
StringBuilder sb = new StringBuilder();
String sep = System.getProperty("line.separator");
while ((line = br.readLine()) != null) {