svn commit: r1559478 - /hama/trunk/graph/src/main/java/org/apache/hama/graph/OffHeapVerticesInfo.java

[tommaso]

Author: tommaso
Date: Sun Jan 19 06:58:41 2014
New Revision: 1559478

URL: http://svn.apache.org/r1559478
Log:
no jira - defensive programming against wrong usage of skipping iterator in 
OffHeapVI

Modified:
    
hama/trunk/graph/src/main/java/org/apache/hama/graph/OffHeapVerticesInfo.java

Modified: 
hama/trunk/graph/src/main/java/org/apache/hama/graph/OffHeapVerticesInfo.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/graph/src/main/java/org/apache/hama/graph/OffHeapVerticesInfo.java?rev=1559478&r1=1559477&r2=1559478&view=diff
==============================================================================
--- 
hama/trunk/graph/src/main/java/org/apache/hama/graph/OffHeapVerticesInfo.java 
(original)
+++ 
hama/trunk/graph/src/main/java/org/apache/hama/graph/OffHeapVerticesInfo.java 
Sun Jan 19 06:58:41 2014
@@ -17,10 +17,6 @@
  */
 package org.apache.hama.graph;
 
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentSkipListMap;
-
 import org.apache.directmemory.DirectMemory;
 import org.apache.directmemory.cache.CacheService;
 import org.apache.directmemory.memory.Pointer;
@@ -33,6 +29,10 @@ import org.apache.hama.HamaConfiguration
 import org.apache.hama.bsp.TaskAttemptID;
 import org.apache.hama.util.ReflectionUtils;
 
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentSkipListMap;
+
 /**
  * An off heap version of a {@link org.apache.hama.graph.Vertex} storage.
  */
@@ -143,7 +143,7 @@ public class OffHeapVerticesInfo<V exten
       @Override
       public Vertex<V, E, M> next() {
         currentIndex++;
-        if (currentVertex.getRunner() == null) {
+        if (currentVertex != null && currentVertex.getRunner() == null) {
           currentVertex.setRunner(runner);
         }
         return currentVertex;