hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1454234 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Date Fri, 08 Mar 2013 03:42:23 GMT
Author: szetszwo
Date: Fri Mar  8 03:42:23 2013
New Revision: 1454234

URL: http://svn.apache.org/r1454234
Log:
HDFS-4558. Fix the NPE thrown when starting balancer.  Contributed by Junping Du

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1454234&r1=1454233&r2=1454234&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Mar  8 03:42:23 2013
@@ -537,6 +537,8 @@ Release 1.2.0 - unreleased
     HADOOP-9369. DNS#reverseDns() can return hostname with . appended at the
     end. (Karthik Kambatla via atm)
 
+    HDFS-4558. Fix the NPE thrown when starting balancer.  (Junping Du via szetszwo)
+
 Release 1.1.2 - 2013.01.30
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java?rev=1454234&r1=1454233&r2=1454234&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
(original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Fri Mar  8 03:42:23 2013
@@ -803,11 +803,6 @@ public class Balancer implements Tool {
     }
   }
 
-  /** Default constructor */
-  Balancer() throws UnsupportedActionException {
-    checkReplicationPolicyCompatibility(getConf());
-  }
-
   /** Construct a balancer from the given configuration */
   Balancer(Configuration conf) throws UnsupportedActionException {
     checkReplicationPolicyCompatibility(conf);
@@ -828,7 +823,8 @@ public class Balancer implements Tool {
    */
   public static void main(String[] args) {
     try {
-      System.exit( ToolRunner.run(null, new Balancer(), args) );
+      Configuration conf = new Configuration();
+      System.exit( ToolRunner.run(conf, new Balancer(conf), args) );
     } catch (Throwable e) {
       LOG.error(StringUtils.stringifyException(e));
       System.exit(-1);



Mime
View raw message