Repository: spark Updated Branches: refs/heads/master 8aa1f4c4f -> 3c7a9bae9
SPARK-1523: improve the readability of code in AkkaUtil Actually it is separated from https://github.com/apache/spark/pull/85 as suggested by @rxin compare https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala#L122 and https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala#L117 the first one use get and then toLong, the second one getLong....better to make them consistent very very small fix........ Author: CodingCat <zhunans...@gmail.com> Closes #434 from CodingCat/SPARK-1523 and squashes the following commits: 0e86f3f [CodingCat] improve the readability of code in AkkaUtil Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3c7a9bae Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3c7a9bae Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3c7a9bae Branch: refs/heads/master Commit: 3c7a9bae965bac68aba66e8ea28bb4d750e66baa Parents: 8aa1f4c Author: CodingCat <zhunans...@gmail.com> Authored: Fri Apr 18 10:05:00 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Fri Apr 18 10:05:00 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/util/AkkaUtils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3c7a9bae/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala index d0ff17d..8afe09a 100644 --- a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala @@ -119,7 +119,7 @@ private[spark] object AkkaUtils extends Logging { /** Returns the default Spark timeout to use for Akka remote actor lookup. */ def lookupTimeout(conf: SparkConf): FiniteDuration = { - Duration.create(conf.get("spark.akka.lookupTimeout", "30").toLong, "seconds") + Duration.create(conf.getLong("spark.akka.lookupTimeout", 30), "seconds") } /** Returns the configured max frame size for Akka messages in bytes. */
