Repository: giraph Updated Branches: refs/heads/trunk 01d11687d -> 120091511
GIRAPH-884 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/12009151 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/12009151 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/12009151 Branch: refs/heads/trunk Commit: 120091511f4729441541cd764414fb52a34889b2 Parents: 01d1168 Author: Claudio Martella <[email protected]> Authored: Wed Apr 9 14:48:16 2014 +0200 Committer: Claudio Martella <[email protected]> Committed: Wed Apr 9 14:48:16 2014 +0200 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../src/main/java/org/apache/giraph/edge/ByteArrayEdges.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/12009151/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 7c7a0aa..b1c45d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-884: ByteArrayEdges.iterator() throws NPE when no edges are present + (cmuchinsky via claudio) + GIRAPH-872: Minor inconsistencies with netty handler logic after netty 4 upgrade (cmuchinsky via claudio) http://git-wip-us.apache.org/repos/asf/giraph/blob/12009151/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java b/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java index b9d1f6c..3f69c5c 100644 --- a/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java +++ b/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java @@ -18,6 +18,7 @@ package org.apache.giraph.edge; +import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; import org.apache.giraph.utils.ExtendedDataInput; import org.apache.giraph.utils.ExtendedDataOutput; @@ -164,7 +165,11 @@ public class ByteArrayEdges<I extends WritableComparable, E extends Writable> @Override public Iterator<Edge<I, E>> iterator() { - return new ByteArrayEdgeIterator(); + if (edgeCount == 0) { + return Iterators.emptyIterator(); + } else { + return new ByteArrayEdgeIterator(); + } } @Override
