You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/05/09 04:07:18 UTC
spark git commit: Revert "[SPARK-7490] [CORE] [Minor]
MapOutputTracker.deserializeMapStatuses: close input streams"
Repository: spark
Updated Branches:
refs/heads/branch-1.3 ef4a0ea7b -> 6f0171130
Revert "[SPARK-7490] [CORE] [Minor] MapOutputTracker.deserializeMapStatuses: close input streams"
This reverts commit ef4a0ea7bab19d5ec8ecad3ff4f8556361abeebe.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6f017113
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6f017113
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6f017113
Branch: refs/heads/branch-1.3
Commit: 6f017113053c33b6d41338dbcbc2c3746f5be384
Parents: ef4a0ea
Author: Andrew Or <an...@databricks.com>
Authored: Fri May 8 19:07:11 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Fri May 8 19:07:11 2015 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/MapOutputTracker.scala | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/6f017113/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/MapOutputTracker.scala b/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
index a50c28b..6e4edc7 100644
--- a/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
+++ b/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
@@ -367,11 +367,7 @@ private[spark] object MapOutputTracker extends Logging {
// Opposite of serializeMapStatuses.
def deserializeMapStatuses(bytes: Array[Byte]): Array[MapStatus] = {
val objIn = new ObjectInputStream(new GZIPInputStream(new ByteArrayInputStream(bytes)))
- Utils.tryWithSafeFinally {
- objIn.readObject().asInstanceOf[Array[MapStatus]]
- } {
- objIn.close()
- }
+ objIn.readObject().asInstanceOf[Array[MapStatus]]
}
// Convert an array of MapStatuses to locations and sizes for a given reduce ID. If
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org