From b505bb6726eb52c01d2e2849bd4973cccdc1637f Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 14 Oct 2015 17:21:54 -0700 Subject: [PATCH] Remove fix transient annotations for scala 2.11 --- .../main/scala/org/apache/spark/rpc/netty/NettyRpcEnv.scala | 2 +- .../main/scala/org/apache/spark/sql/hive/HiveContext.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/rpc/netty/NettyRpcEnv.scala b/core/src/main/scala/org/apache/spark/rpc/netty/NettyRpcEnv.scala index 89b6df76c2707..c3660690cbd6f 100644 --- a/core/src/main/scala/org/apache/spark/rpc/netty/NettyRpcEnv.scala +++ b/core/src/main/scala/org/apache/spark/rpc/netty/NettyRpcEnv.scala @@ -305,7 +305,7 @@ private[netty] class NettyRpcEnvFactory extends RpcEnvFactory with Logging { } } -private[netty] class NettyRpcEndpointRef(@transient conf: SparkConf) +private[netty] class NettyRpcEndpointRef(@transient private val conf: SparkConf) extends RpcEndpointRef(conf) with Serializable with Logging { @transient @volatile private var nettyEnv: NettyRpcEnv = _ diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala index e620d7fb82af9..edb29dad81ad1 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala @@ -89,9 +89,9 @@ private[hive] case class CurrentDatabase(ctx: HiveContext) class HiveContext private[hive]( sc: SparkContext, cacheManager: CacheManager, - @transient listener: SQLListener, - @transient execHive: ClientWrapper, - @transient metaHive: ClientInterface, + listener: SQLListener, + @transient private val execHive: ClientWrapper, + @transient private val metaHive: ClientInterface, isRootContext: Boolean) extends SQLContext(sc, cacheManager, listener, isRootContext) with Logging { self =>