Merge remote-tracking branch 'upstream/dev' into dev

2012-08-23 20:16:50 -07:00 · 2012-08-23 20:16:50 -07:00 · 3b1f5480a4
parent 995ad6ba36 59b831b9d1
commit 3b1f5480a4
1 changed files with 1 additions and 0 deletions
--- 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
    }
  }