SPARK-1583: Fix a bug that using java.util.HashMap by mistake

zsxwing · rxin · commit a66460661303 · 2014-04-23T14:12:20.000-07:00
JIRA: https://issues.apache.org/jira/browse/SPARK-1583 Does anyone know why using `java.util.HashMap` rather than `mutable.HashMap`? Some methods of `java.util.HashMap` are not generics and compiler can not help us find similar problems. Author: zsxwing <zsxwing@gmail.com> Closes #500 from zsxwing/SPARK-1583 and squashes the following commits: 7bfd74d [zsxwing] SPARK-1583: Fix a bug that using java.util.HashMap by mistake
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
@@ -203,7 +203,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
       val locations = blockLocations.get(blockId)
       locations -= blockManagerId
       if (locations.size == 0) {
-        blockLocations.remove(locations)
+        blockLocations.remove(blockId)
       }
     }
     listenerBus.post(SparkListenerBlockManagerRemoved(blockManagerId))

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus`
`203`	`203`	`val locations = blockLocations.get(blockId)`
`204`	`204`	`locations -= blockManagerId`
`205`	`205`	`if (locations.size == 0) {`
`206`		`- blockLocations.remove(locations)`
	`206`	`+ blockLocations.remove(blockId)`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`	`listenerBus.post(SparkListenerBlockManagerRemoved(blockManagerId))`