You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ap...@apache.org on 2012/11/20 00:10:35 UTC
svn commit: r1411478 - in /giraph/trunk: CHANGELOG
giraph/src/main/java/org/apache/giraph/graph/EdgeListVertex.java
giraph/src/main/java/org/apache/giraph/graph/VertexResolver.java
Author: apresta
Date: Mon Nov 19 23:10:34 2012
New Revision: 1411478
URL: http://svn.apache.org/viewvc?rev=1411478&view=rev
Log:
GIRAPH-433: Vertex#initialize() shouldn't be called with null edges (apresta)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/EdgeListVertex.java
giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/VertexResolver.java
Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1411478&r1=1411477&r2=1411478&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Nov 19 23:10:34 2012
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-433: Vertex#initialize() shouldn't be called with null edges (apresta)
+
GIRAPH-416: MasterObserver for user post-application customization (nitay)
GIRAPH-427: Add committer information for Nitay Joffe to pom.xml (nitay)
Modified: giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/EdgeListVertex.java
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/EdgeListVertex.java?rev=1411478&r1=1411477&r2=1411478&view=diff
==============================================================================
--- giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/EdgeListVertex.java (original)
+++ giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/EdgeListVertex.java Mon Nov 19 23:10:34 2012
@@ -55,10 +55,8 @@ public abstract class EdgeListVertex<I e
@Override
public void setEdges(Map<I, E> edges) {
- if (edges != null) {
- for (Map.Entry<I, E> edge : edges.entrySet()) {
- edgeList.add(new Edge<I, E>(edge.getKey(), edge.getValue()));
- }
+ for (Map.Entry<I, E> edge : edges.entrySet()) {
+ edgeList.add(new Edge<I, E>(edge.getKey(), edge.getValue()));
}
}
Modified: giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/VertexResolver.java
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/VertexResolver.java?rev=1411478&r1=1411477&r2=1411478&view=diff
==============================================================================
--- giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/VertexResolver.java (original)
+++ giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/VertexResolver.java Mon Nov 19 23:10:34 2012
@@ -84,12 +84,10 @@ public class VertexResolver<I extends Wr
vertex = vertexChanges.getAddedVertexList().get(0);
}
}
- if (vertex == null &&
- (hasMessages || !vertexChanges.getAddedEdgeList().isEmpty())) {
+ if (vertex == null && (hasMessages || (vertexChanges != null &&
+ !vertexChanges.getAddedEdgeList().isEmpty()))) {
vertex = instantiateVertex();
- vertex.initialize(vertexId,
- getConf().createVertexValue(),
- null);
+ vertex.initialize(vertexId, getConf().createVertexValue());
}
} else {
if ((vertexChanges != null) &&
@@ -100,13 +98,12 @@ public class VertexResolver<I extends Wr
}
}
- if (vertexChanges != null &&
+ if (vertex != null && vertexChanges != null &&
!vertexChanges.getAddedEdgeList().isEmpty()) {
MutableVertex<I, V, E, M> mutableVertex =
(MutableVertex<I, V, E, M>) vertex;
for (Edge<I, E> edge : vertexChanges.getAddedEdgeList()) {
- mutableVertex.addEdge(edge.getTargetVertexId(),
- edge.getValue());
+ mutableVertex.addEdge(edge.getTargetVertexId(), edge.getValue());
}
}