Repository: spark Updated Branches: refs/heads/branch-2.0 ef8d16ec4 -> 1f4c4def9
[CORE][MINOR][DOC] Removing incorrect scaladoc ## What changes were proposed in this pull request? I don't think the method will ever throw an exception so removing a false comment. Sorry srowen and rxin again -- I simply couldn't resist. I wholeheartedly support merging the change with a bigger one (and trashing this PR). ## How was this patch tested? Manual build Author: Jacek Laskowski <ja...@japila.pl> Closes #13384 from jaceklaskowski/blockinfomanager. (cherry picked from commit 6954704299386cdcfdbc3f7fa6967c0880c9b7b8) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1f4c4def Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1f4c4def Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1f4c4def Branch: refs/heads/branch-2.0 Commit: 1f4c4def946fd990393aba93aa76b5ac187fc111 Parents: ef8d16e Author: Jacek Laskowski <ja...@japila.pl> Authored: Tue May 31 19:21:25 2016 -0500 Committer: Sean Owen <so...@cloudera.com> Committed: Tue May 31 19:21:50 2016 -0500 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/storage/BlockInfoManager.scala | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1f4c4def/core/src/main/scala/org/apache/spark/storage/BlockInfoManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/storage/BlockInfoManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockInfoManager.scala index 20ffe13..dd8f5ba 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockInfoManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockInfoManager.scala @@ -211,9 +211,6 @@ private[storage] class BlockInfoManager extends Logging { * If another task has already locked this block for either reading or writing, then this call * will block until the other locks are released or will return immediately if `blocking = false`. * - * If this is called by a task which already holds the block's exclusive write lock, then this - * method will throw an exception. - * * @param blockId the block to lock. * @param blocking if true (default), this call will block until the lock is acquired. If false, * this call will return immediately if the lock acquisition fails. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
