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 E31B310C95 for ; Mon, 15 Dec 2014 18:35:54 +0000 (UTC) Received: (qmail 59729 invoked by uid 500); 15 Dec 2014 18:35:52 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 59412 invoked by uid 500); 15 Dec 2014 18:35:52 -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 59222 invoked by uid 99); 15 Dec 2014 18:35:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2014 18:35:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 72DC0A2BB13; Mon, 15 Dec 2014 18:35:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kasha@apache.org To: common-commits@hadoop.apache.org Date: Mon, 15 Dec 2014 18:35:55 -0000 Message-Id: <2d76760bf73d4122a333b2f39427eec1@git.apache.org> In-Reply-To: <4f1fefaf8cb44792ae4248819d4c8eaf@git.apache.org> References: <4f1fefaf8cb44792ae4248819d4c8eaf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/50] [abbrv] hadoop git commit: HADOOP-11372. Fix new findbugs warnings in mapreduce-examples. Contributed by Li Lu. HADOOP-11372. Fix new findbugs warnings in mapreduce-examples. Contributed by Li Lu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be86237c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be86237c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be86237c Branch: refs/heads/YARN-2139 Commit: be86237c09533a6691ed9eb4864643657331a11a Parents: 74d4bfd Author: Haohui Mai Authored: Tue Dec 9 10:48:35 2014 -0800 Committer: Haohui Mai Committed: Tue Dec 9 10:49:55 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/examples/pi/Parser.java | 5 ++--- .../java/org/apache/hadoop/examples/pi/math/Bellard.java | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/be86237c/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 2051698..4b23471 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -542,6 +542,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11368. Fix SSLFactory truststore reloader thread leak in KMSClientProvider. (Arun Suresh via wang) + HADOOP-11372. Fix new findbugs warnings in mapreduce-examples. + (Li Lu via wheat9) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/be86237c/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Parser.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Parser.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Parser.java index 187520a..a2db9d1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Parser.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Parser.java @@ -151,11 +151,10 @@ public final class Parser { static > Map combine(Map> m) { final Map combined = new TreeMap(); for(Parameter p : Parameter.values()) { + //note: results would never be null due to the design of Util.combine final List results = Util.combine(m.get(p)); Util.out.format("%-6s => ", p); - if (results == null) - Util.out.println("null"); - else if (results.size() != 1) + if (results.size() != 1) Util.out.println(results.toString().replace(", ", ",\n ")); else { final T r = results.get(0); http://git-wip-us.apache.org/repos/asf/hadoop/blob/be86237c/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/math/Bellard.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/math/Bellard.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/math/Bellard.java index 90b608f..d909d92 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/math/Bellard.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/math/Bellard.java @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.NoSuchElementException; import org.apache.hadoop.examples.pi.Container; import org.apache.hadoop.examples.pi.Util; @@ -255,7 +256,13 @@ public final class Bellard { public boolean hasNext() {return i < parts.length;} /** {@inheritDoc} */ @Override - public Summation next() {return parts[i++];} + public Summation next() throws NoSuchElementException { + if (hasNext()) { + return parts[i++]; + } else { + throw new NoSuchElementException("Sum's iterator does not have next!"); + } + } /** Unsupported */ @Override public void remove() {throw new UnsupportedOperationException();}