You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2014/12/15 19:35:55 UTC
[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 <wh...@apache.org>
Authored: Tue Dec 9 10:48:35 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
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 <T extends Combinable<T>> Map<Parameter, T> combine(Map<Parameter, List<T>> m) {
final Map<Parameter, T> combined = new TreeMap<Parameter, T>();
for(Parameter p : Parameter.values()) {
+ //note: results would never be null due to the design of Util.combine
final List<T> 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();}