aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMosharaf Chowdhury <mosharaf@cs.berkeley.edu>2012-08-23 20:16:50 -0700
committerMosharaf Chowdhury <mosharaf@cs.berkeley.edu>2012-08-23 20:16:50 -0700
commit3b1f5480a498b78a85193879c1f1910de8a336f6 (patch)
tree2e22af6296742d400f992021d4d7fc59c773b763
parent995ad6ba36df1d06ae1816cd7ba570ec2fc15341 (diff)
parent59b831b9d1161a1c2d4312bb6711d8694983b5d6 (diff)
downloadspark-3b1f5480a498b78a85193879c1f1910de8a336f6.tar.gz
spark-3b1f5480a498b78a85193879c1f1910de8a336f6.tar.bz2
spark-3b1f5480a498b78a85193879c1f1910de8a336f6.zip
Merge remote-tracking branch 'upstream/dev' into dev
-rw-r--r--core/src/main/scala/spark/broadcast/HttpBroadcast.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/spark/broadcast/HttpBroadcast.scala b/core/src/main/scala/spark/broadcast/HttpBroadcast.scala
index e4b1356448..aa8bb77f41 100644
--- a/core/src/main/scala/spark/broadcast/HttpBroadcast.scala
+++ b/core/src/main/scala/spark/broadcast/HttpBroadcast.scala
@@ -76,6 +76,7 @@ private object HttpBroadcast extends Logging {
def stop() {
if (server != null) {
server.stop()
+ server = null
}
}