spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject git commit: SPARK-3009: Reverted readObject method in ApplicationInfo so that Applic...
Date Thu, 14 Aug 2014 22:02:48 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 c39a3f337 -> f5d9176fb


SPARK-3009: Reverted readObject method in ApplicationInfo so that Applic...

...ationInfo is initialized properly after deserialization

Author: Jacek Lewandowski <lewandowski.jacek@gmail.com>

Closes #1947 from jacek-lewandowski/master and squashes the following commits:

713b2f1 [Jacek Lewandowski] SPARK-3009: Reverted readObject method in ApplicationInfo so that
ApplicationInfo is initialized properly after deserialization

(cherry picked from commit a75bc7a21db07258913d038bf604c0a3c1e55b46)
Signed-off-by: Andrew Or <andrewor14@gmail.com>


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

Branch: refs/heads/branch-1.1
Commit: f5d9176fba934fa1f440d14d1ac7cd6f149434c4
Parents: c39a3f3
Author: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Authored: Thu Aug 14 15:01:39 2014 -0700
Committer: Andrew Or <andrewor14@gmail.com>
Committed: Thu Aug 14 15:02:43 2014 -0700

----------------------------------------------------------------------
 .../scala/org/apache/spark/deploy/master/ApplicationInfo.scala  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/f5d9176f/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala b/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
index 72d0589..d367442 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
@@ -46,6 +46,11 @@ private[spark] class ApplicationInfo(
 
   init()
 
+  private def readObject(in: java.io.ObjectInputStream): Unit = {
+    in.defaultReadObject()
+    init()
+  }
+
   private def init() {
     state = ApplicationState.WAITING
     executors = new mutable.HashMap[Int, ExecutorInfo]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message