spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject git commit: SPARK-1583: Fix a bug that using java.util.HashMap by mistake
Date Wed, 23 Apr 2014 21:12:32 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.0 d36d75cbd -> 19ef78fdf


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

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

(cherry picked from commit a66460661303bd652b5c5d32860216cc3ceb7f98)
Signed-off-by: Reynold Xin <rxin@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/19ef78fd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/19ef78fd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/19ef78fd

Branch: refs/heads/branch-1.0
Commit: 19ef78fdfbada3200b1e4b8023bfa00d386b70ce
Parents: d36d75c
Author: zsxwing <zsxwing@gmail.com>
Authored: Wed Apr 23 14:12:20 2014 -0700
Committer: Reynold Xin <rxin@apache.org>
Committed: Wed Apr 23 14:12:29 2014 -0700

----------------------------------------------------------------------
 .../scala/org/apache/spark/storage/BlockManagerMasterActor.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/19ef78fd/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
index c57b6e8..63fa5d3 100644
--- 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))


Mime
View raw message