Restore !unrolled.hasNext check.

wangyum · wangyum · commit c13edcee677a · 2016-12-17T21:27:52.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala b/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala
@@ -694,7 +694,7 @@ private[storage] class PartiallyUnrolledIterator[T](
   }
 
   override def next(): T = {
-    if (unrolled == null) {
+    if (unrolled == null || !unrolled.hasNext) {
       rest.next()
     } else {
       unrolled.next()

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ private[storage] class PartiallyUnrolledIterator[T](`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`override def next(): T = {`
`697`		`- if (unrolled == null) {`
	`697`	`+ if (unrolled == null \|\| !unrolled.hasNext) {`
`698`	`698`	`rest.next()`
`699`	`699`	`} else {`
`700`	`700`	`unrolled.next()`