iii

rxin · rxin · commit 2a13f70655d9 · 2014-09-29T19:43:23.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/network/nio/NioBlockTransferService.scala b/core/src/main/scala/org/apache/spark/network/nio/NioBlockTransferService.scala
@@ -200,6 +200,11 @@ final class NioBlockTransferService(conf: SparkConf, securityManager: SecurityMa
     val buffer = blockDataManager.getBlockData(blockId).orNull
     logDebug("GetBlock " + blockId + " used " + Utils.getUsedTimeMs(startTimeMs)
       + " and got buffer " + buffer)
-    buffer.nioByteBuffer()
+    if (buffer == null) {
+      logError(s"block $blockId cannot be found !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+      null
+    } else {
+      buffer.nioByteBuffer()
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,11 @@ final class NioBlockTransferService(conf: SparkConf, securityManager: SecurityMa`
`200`	`200`	`val buffer = blockDataManager.getBlockData(blockId).orNull`
`201`	`201`	`logDebug("GetBlock " + blockId + " used " + Utils.getUsedTimeMs(startTimeMs)`
`202`	`202`	`+ " and got buffer " + buffer)`
`203`		`- buffer.nioByteBuffer()`
	`203`	`+ if (buffer == null) {`
	`204`	`+ logError(s"block $blockId cannot be found !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")`
	`205`	`+ null`
	`206`	`+ } else {`
	`207`	`+ buffer.nioByteBuffer()`
	`208`	`+ }`
`204`	`209`	`}`
`205`	`210`	`}`