Author: wheat9
Date: Fri Jun 20 22:25:02 2014
New Revision: 1604293
URL: http://svn.apache.org/r1604293
Log:
HADOOP-10479. Merge r1604292 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1604293&r1=1604292&r2=1604293&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jun 20 22:25:02 2014
@@ -267,6 +267,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter
via tucu)
+ HADOOP-10479. Fix new findbugs warnings in hadoop-minikdc.
+ (Swarnim Kulkarni via wheat9)
+
Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java?rev=1604293&r1=1604292&r2=1604293&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
Fri Jun 20 22:25:02 2014
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.minikdc;
+import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.text.StrSubstitutor;
@@ -56,7 +57,7 @@ import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
@@ -126,9 +127,9 @@ public class MiniKdc {
+ file.getAbsolutePath());
}
Properties userConf = new Properties();
- FileReader r = null;
+ InputStreamReader r = null;
try {
- r = new FileReader(file);
+ r = new InputStreamReader(new FileInputStream(file), Charsets.UTF_8);
userConf.load(r);
} finally {
if (r != null) {
@@ -438,7 +439,7 @@ public class MiniKdc {
BufferedReader r = null;
try {
- r = new BufferedReader(new InputStreamReader(is2));
+ r = new BufferedReader(new InputStreamReader(is2, Charsets.UTF_8));
String line = r.readLine();
while (line != null) {
