Author: junping_du
Date: Thu Apr 17 18:05:43 2014
New Revision: 1588324
URL: http://svn.apache.org/r1588324
Log:
YARN-1870. FileInputStream is not closed in
ProcfsBasedProcessTree#constructProcessSMAPInfo. (Fengdong Yu via junping_du)
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1588324&r1=1588323&r2=1588324&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Thu Apr 17 18:05:43 2014
@@ -53,6 +53,9 @@ Release 2.5.0 - UNRELEASED
YARN-1923. Make Fair Scheduler resource ratio calculations terminate faster
(Anubhav Dhoot via Sandy Ryza)
+ YARN-1870. FileInputStream is not closed in
ProcfsBasedProcessTree#constructProcessSMAPInfo.
+ (Fengdong Yu via junping_du)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java?rev=1588324&r1=1588323&r2=1588324&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
Thu Apr 17 18:05:43 2014
@@ -20,7 +20,6 @@ package org.apache.hadoop.yarn.util;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
@@ -736,7 +735,7 @@ public class ProcfsBasedProcessTree exte
fReader = new FileReader(file);
in = new BufferedReader(fReader);
ProcessSmapMemoryInfo memoryMappingInfo = null;
- List<String> lines = IOUtils.readLines(new FileInputStream(file));
+ List<String> lines = IOUtils.readLines(in);
for (String line : lines) {
line = line.trim();
try {
