hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r1170287 - in /hadoop/common/branches/branch-0.20-security-205: ./ src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/ src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/ src/contrib/streaming/src/java/o...
Date Tue, 13 Sep 2011 18:32:51 GMT
Author: acmurthy
Date: Tue Sep 13 18:32:51 2011
New Revision: 1170287

URL: http://svn.apache.org/viewvc?rev=1170287&view=rev
Log:
Merge -r 1170285:1170286 from branch-0.20-security to branch-0.20-security-205 to fix MAPREDUCE-2549.

Modified:
    hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
    hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java
    hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
    hadoop/common/branches/branch-0.20-security-205/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java

Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1170287&r1=1170286&r2=1170287&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Tue Sep 13 18:32:51 2011
@@ -136,6 +136,9 @@ Release 0.20.205.0 - 2011.09.12
 
     HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
 
+    MAPREDUCE-2549. Fix resource leaks in Eclipse plugin. (Devaraj K via
+    acmurthy) 
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java?rev=1170287&r1=1170286&r2=1170287&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java
(original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java
Tue Sep 13 18:32:51 2011
@@ -36,6 +36,7 @@ import javax.xml.parsers.ParserConfigura
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.eclipse.Activator;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.JobID;
@@ -420,8 +421,13 @@ public class HadoopServer {
    */
   public void storeSettingsToFile(File file) throws IOException {
     FileOutputStream fos = new FileOutputStream(file);
-    this.conf.writeXml(fos);
-    fos.close();
+    try {
+      this.conf.writeXml(fos);
+      fos.close();
+      fos = null;
+    } finally {
+      IOUtils.closeStream(fos);
+    }
   }
 
   /* @inheritDoc */

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java?rev=1170287&r1=1170286&r2=1170287&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
(original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
Tue Sep 13 18:32:51 2011
@@ -28,6 +28,7 @@ import org.apache.hadoop.eclipse.Activat
 import org.apache.hadoop.eclipse.ErrorMessageDialog;
 import org.apache.hadoop.eclipse.server.HadoopServer;
 import org.apache.hadoop.eclipse.server.JarModule;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapred.JobConf;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -163,8 +164,13 @@ public class RunOnHadoopWizard extends W
       // confDir);
       File confFile = new File(confDir, "core-site.xml");
       FileOutputStream fos = new FileOutputStream(confFile);
-      conf.writeXml(fos);
-      fos.close();
+      try {
+        conf.writeXml(fos);
+        fos.close();
+        fos = null;
+      } finally {
+        IOUtils.closeStream(fos);
+      }
 
     } catch (IOException ioe) {
       ioe.printStackTrace();

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java?rev=1170287&r1=1170286&r2=1170287&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java
(original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java
Tue Sep 13 18:32:51 2011
@@ -22,6 +22,8 @@ import java.io.*;
 import java.net.InetAddress;
 import java.util.*;
 
+import org.apache.hadoop.io.IOUtils;
+
 /**
  * This is a class used to get the current environment
  * on the host machines running the map/reduce. This class
@@ -57,17 +59,23 @@ public class Environment extends Propert
 
     Process pid = Runtime.getRuntime().exec(command);
     BufferedReader in = new BufferedReader(new InputStreamReader(pid.getInputStream()));
-    while (true) {
-      String line = in.readLine();
-      if (line == null) break;
-      int p = line.indexOf("=");
-      if (p != -1) {
-        String name = line.substring(0, p);
-        String value = line.substring(p + 1);
-        setProperty(name, value);
+    try {
+      while (true) {
+        String line = in.readLine();
+        if (line == null)
+          break;
+        int p = line.indexOf("=");
+        if (p != -1) {
+          String name = line.substring(0, p);
+          String value = line.substring(p + 1);
+          setProperty(name, value);
+        }
       }
+      in.close();
+      in = null;
+    } finally {
+      IOUtils.closeStream(in);
     }
-    in.close();
     try {
       pid.waitFor();
     } catch (InterruptedException e) {



Mime
View raw message