Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B86F1085D for ; Wed, 26 Mar 2014 19:06:48 +0000 (UTC) Received: (qmail 93722 invoked by uid 500); 26 Mar 2014 19:06:47 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 93662 invoked by uid 500); 26 Mar 2014 19:06:46 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 93648 invoked by uid 99); 26 Mar 2014 19:06:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 19:06:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 19:06:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 287F9238889B; Wed, 26 Mar 2014 19:06:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1582018 - in /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: ./ src/ src/main/java/ src/main/java/org/apache/hadoop/conf/ src/main/java/org/apache/hadoop/io/ src/main/java/org/apache/hadoop/util/ Date: Wed, 26 Mar 2014 19:06:18 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140326190619.287F9238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Wed Mar 26 19:06:17 2014 New Revision: 1582018 URL: http://svn.apache.org/r1582018 Log: svn merge -c 1582015 from trunk for HADOOP-10437. Fix the javac warnings in the conf and the util package. Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ClassUtil.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1582015 Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar 26 19:06:17 2014 @@ -129,6 +129,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly. (guodongdong via szetszwo) + HADOOP-10437. Fix the javac warnings in the conf and the util package. + (szetszwo) + BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS HADOOP-10185. FileSystem API for ACLs. (cnauroth) Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1582015 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1582015 Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1582015 Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java Wed Mar 26 19:06:17 2014 @@ -2251,13 +2251,13 @@ public class Configuration implements It root = (Element)resource; } - if (doc == null && root == null) { - if (quiet) - return null; - throw new RuntimeException(resource + " not found"); - } - if (root == null) { + if (doc == null) { + if (quiet) { + return null; + } + throw new RuntimeException(resource + " not found"); + } root = doc.getDocumentElement(); } Properties toAddTo = properties; Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java Wed Mar 26 19:06:17 2014 @@ -131,15 +131,14 @@ public class ReconfigurationServlet exte @SuppressWarnings("unchecked") private Enumeration getParams(HttpServletRequest req) { - return (Enumeration) req.getParameterNames(); + return req.getParameterNames(); } /** * Apply configuratio changes after admin has approved them. */ private void applyChanges(PrintWriter out, Reconfigurable reconf, - HttpServletRequest req) - throws IOException, ReconfigurationException { + HttpServletRequest req) throws ReconfigurationException { Configuration oldConf = reconf.getConf(); Configuration newConf = new Configuration(); Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java Wed Mar 26 19:06:17 2014 @@ -47,18 +47,18 @@ public class WritableName { /** Set the name that a class should be known as to something other than the * class name. */ - public static synchronized void setName(Class writableClass, String name) { + public static synchronized void setName(Class writableClass, String name) { CLASS_TO_NAME.put(writableClass, name); NAME_TO_CLASS.put(name, writableClass); } /** Add an alternate name for a class. */ - public static synchronized void addName(Class writableClass, String name) { + public static synchronized void addName(Class writableClass, String name) { NAME_TO_CLASS.put(name, writableClass); } /** Return the name for a class. Default is {@link Class#getName()}. */ - public static synchronized String getName(Class writableClass) { + public static synchronized String getName(Class writableClass) { String name = CLASS_TO_NAME.get(writableClass); if (name != null) return name; Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java Wed Mar 26 19:06:17 2014 @@ -17,7 +17,6 @@ */ package org.apache.hadoop.util; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -26,6 +25,7 @@ import java.util.concurrent.LinkedBlocki import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; @@ -68,7 +68,7 @@ public class AsyncDiskService { * * @param volumes The roots of the file system volumes. */ - public AsyncDiskService(String[] volumes) throws IOException { + public AsyncDiskService(String[] volumes) { threadFactory = new ThreadFactory() { @Override Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ClassUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ClassUtil.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ClassUtil.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ClassUtil.java Wed Mar 26 19:06:17 2014 @@ -36,13 +36,13 @@ public class ClassUtil { * @return a jar file that contains the class, or null. * @throws IOException */ - public static String findContainingJar(Class clazz) { + public static String findContainingJar(Class clazz) { ClassLoader loader = clazz.getClassLoader(); String classFile = clazz.getName().replaceAll("\\.", "/") + ".class"; try { - for (Enumeration itr = loader.getResources(classFile); + for(final Enumeration itr = loader.getResources(classFile); itr.hasMoreElements();) { - URL url = (URL) itr.nextElement(); + final URL url = itr.nextElement(); if ("jar".equals(url.getProtocol())) { String toReturn = url.getPath(); if (toReturn.startsWith("file:")) { Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java Wed Mar 26 19:06:17 2014 @@ -27,7 +27,6 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.util.Shell; /** * Class that provides utility functions for checking disk problem @@ -35,9 +34,6 @@ import org.apache.hadoop.util.Shell; @InterfaceAudience.Private @InterfaceStability.Unstable public class DiskChecker { - - private static final long SHELL_TIMEOUT = 10 * 1000; - public static class DiskErrorException extends IOException { public DiskErrorException(String msg) { super(msg); Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java Wed Mar 26 19:06:17 2014 @@ -25,7 +25,6 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.commons.cli.CommandLine; @@ -397,7 +396,8 @@ public class GenericOptionsParser { if (!localFs.exists(path)) { throw new FileNotFoundException("File " + tmp + " does not exist."); } - finalPath = path.makeQualified(localFs).toString(); + finalPath = path.makeQualified(localFs.getUri(), + localFs.getWorkingDirectory()).toString(); } else { // check if the file exists in this file system @@ -408,7 +408,8 @@ public class GenericOptionsParser { if (!fs.exists(path)) { throw new FileNotFoundException("File " + tmp + " does not exist."); } - finalPath = path.makeQualified(fs).toString(); + finalPath = path.makeQualified(fs.getUri(), + fs.getWorkingDirectory()).toString(); } finalArr[i] = finalPath; } Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java Wed Mar 26 19:06:17 2014 @@ -169,9 +169,8 @@ public class HostsFileReader { this.excludesFile = excludesFile; } - public synchronized void updateFileNames(String includesFile, - String excludesFile) - throws IOException { + public synchronized void updateFileNames(String includesFile, + String excludesFile) { setIncludesFile(includesFile); setExcludesFile(excludesFile); } Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java Wed Mar 26 19:06:17 2014 @@ -245,7 +245,7 @@ public class LineReader implements Close } } while (newlineLength == 0 && bytesConsumed < maxBytesToConsume); - if (bytesConsumed > (long)Integer.MAX_VALUE) { + if (bytesConsumed > Integer.MAX_VALUE) { throw new IOException("Too many bytes before newline: " + bytesConsumed); } return (int)bytesConsumed; @@ -343,7 +343,7 @@ public class LineReader implements Close } } while (delPosn < recordDelimiterBytes.length && bytesConsumed < maxBytesToConsume); - if (bytesConsumed > (long) Integer.MAX_VALUE) { + if (bytesConsumed > Integer.MAX_VALUE) { throw new IOException("Too many bytes before delimiter: " + bytesConsumed); } return (int) bytesConsumed; Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java Wed Mar 26 19:06:17 2014 @@ -99,7 +99,8 @@ public class ProgramDriver { * @throws NoSuchMethodException * @throws SecurityException */ - public void addClass (String name, Class mainClass, String description) throws Throwable { + public void addClass(String name, Class mainClass, String description) + throws Throwable { programs.put(name , new ProgramDescription(mainClass, description)); } Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java Wed Mar 26 19:06:17 2014 @@ -64,7 +64,7 @@ public class Progress { public synchronized Progress addPhase() { Progress phase = addNewPhase(); // set equal weightage for all phases - progressPerPhase = 1.0f / (float)phases.size(); + progressPerPhase = 1.0f / phases.size(); fixedWeightageForAllPhases = true; return phase; } @@ -110,7 +110,7 @@ public class Progress { addNewPhase(); } // set equal weightage for all phases - progressPerPhase = 1.0f / (float)phases.size(); + progressPerPhase = 1.0f / phases.size(); fixedWeightageForAllPhases = true; } Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java Wed Mar 26 19:06:17 2014 @@ -78,7 +78,7 @@ public class RunJar { try { Enumeration entries = jar.entries(); while (entries.hasMoreElements()) { - JarEntry entry = (JarEntry)entries.nextElement(); + final JarEntry entry = entries.nextElement(); if (!entry.isDirectory() && unpackRegex.matcher(entry.getName()).matches()) { InputStream in = jar.getInputStream(entry); Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java Wed Mar 26 19:06:17 2014 @@ -431,7 +431,7 @@ public class StringUtils { ArrayList strList = new ArrayList(); int startIndex = 0; int nextIndex = 0; - while ((nextIndex = str.indexOf((int)separator, startIndex)) != -1) { + while ((nextIndex = str.indexOf(separator, startIndex)) != -1) { strList.add(str.substring(startIndex, nextIndex)); startIndex = nextIndex + 1; } Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java?rev=1582018&r1=1582017&r2=1582018&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java Wed Mar 26 19:06:17 2014 @@ -19,18 +19,13 @@ package org.apache.hadoop.util; import java.io.IOException; -import java.net.URL; -import java.net.URLDecoder; -import java.util.Enumeration; +import java.io.InputStream; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; import org.apache.hadoop.io.IOUtils; /**