giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clau...@apache.org
Subject git commit: updated refs/heads/trunk to 738fcd2
Date Thu, 15 Aug 2013 15:24:45 GMT
Updated Branches:
  refs/heads/trunk 8af453cda -> 738fcd2a1


GIRAPH-735


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/738fcd2a
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/738fcd2a
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/738fcd2a

Branch: refs/heads/trunk
Commit: 738fcd2a1ea9f97f22bc1cc1c13c43fd357702a4
Parents: 8af453c
Author: Claudio Martella <claudio@apache.org>
Authored: Thu Aug 15 17:24:27 2013 +0200
Committer: Claudio Martella <claudio@apache.org>
Committed: Thu Aug 15 17:24:27 2013 +0200

----------------------------------------------------------------------
 CHANGELOG                                                         | 3 +++
 .../org/apache/giraph/partition/DiskBackedPartitionStore.java     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/738fcd2a/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index f3bba6e..c9b8a15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 1.1.0 - unreleased
+  GIRAPH-735: DiskBackedPartitionStore throws NPE due to uninitialized OutEdges
+  (claudio)
+
   GIRAPH-734: DiskBackedPartitionStore attempting to release a lock it doesn't own
   (cmuchinsky via claudio)
 

http://git-wip-us.apache.org/repos/asf/giraph/blob/738fcd2a/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
b/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
index 87e04c1..1a16dbe 100644
--- a/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
+++ b/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
@@ -402,7 +402,7 @@ public class DiskBackedPartitionStore<I extends WritableComparable,
     id.readFields(in);
     V value = conf.createVertexValue();
     value.readFields(in);
-    OutEdges<I, E> edges = conf.createOutEdges();
+    OutEdges<I, E> edges = conf.createAndInitializeOutEdges(0);
     vertex.initialize(id, value, edges);
     if (in.readBoolean()) {
       vertex.voteToHalt();


Mime
View raw message