From 59c380d69a3831f0239b434a0fa1cf26a481d222 Mon Sep 17 00:00:00 2001 From: Mridul Muralidharan Date: Tue, 16 Apr 2013 03:29:38 +0530 Subject: Fix npe --- core/src/main/scala/spark/storage/BlockManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/spark/storage/BlockManager.scala b/core/src/main/scala/spark/storage/BlockManager.scala index 483b6de34b..c98ee5a0e7 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -794,7 +794,7 @@ class BlockManager( diskStore.putBytes(blockId, bytes, level) } } - val droppedMemorySize = memoryStore.getSize(blockId) + val droppedMemorySize = if (memoryStore.contains(blockId)) memoryStore.getSize(blockId) else 0L val blockWasRemoved = memoryStore.remove(blockId) if (!blockWasRemoved) { logWarning("Block " + blockId + " could not be dropped from memory as it does not exist") -- cgit v1.2.3