diff options
| author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-16 03:29:38 +0530 |
|---|---|---|
| committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-16 03:29:38 +0530 |
| commit | 59c380d69a3831f0239b434a0fa1cf26a481d222 (patch) | |
| tree | 2b11ae1ca3a284b29fae7b6f23003e07d50d5c53 /core | |
| parent | dd2b64ec97ad241b6f171cac0dbb1841b185675a (diff) | |
| download | spark-59c380d69a3831f0239b434a0fa1cf26a481d222.tar.gz spark-59c380d69a3831f0239b434a0fa1cf26a481d222.tar.bz2 spark-59c380d69a3831f0239b434a0fa1cf26a481d222.zip | |
Fix npe
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManager.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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") |