aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-06-15 23:54:38 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-06-15 23:54:38 -0700
commitb3eeac55b8f3c8c7b5ea18281d9d39dab63d5164 (patch)
tree4d8dcaf14d644810ff6f309d4e6d08eadb5ed012
parentf58da6164eaf13dd986a39a40535975096b71b44 (diff)
downloadspark-b3eeac55b8f3c8c7b5ea18281d9d39dab63d5164.tar.gz
spark-b3eeac55b8f3c8c7b5ea18281d9d39dab63d5164.tar.bz2
spark-b3eeac55b8f3c8c7b5ea18281d9d39dab63d5164.zip
Fixed HttpBroadcast to work with this branch's Serializer.
-rw-r--r--core/src/main/scala/spark/broadcast/HttpBroadcast.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/broadcast/HttpBroadcast.scala b/core/src/main/scala/spark/broadcast/HttpBroadcast.scala
index c9f4aaa89a..d0853eadf9 100644
--- a/core/src/main/scala/spark/broadcast/HttpBroadcast.scala
+++ b/core/src/main/scala/spark/broadcast/HttpBroadcast.scala
@@ -90,7 +90,7 @@ private object HttpBroadcast extends Logging {
new FastBufferedOutputStream(new FileOutputStream(file), bufferSize)
}
val ser = SparkEnv.get.serializer.newInstance()
- val serOut = ser.outputStream(out)
+ val serOut = ser.serializeStream(out)
serOut.writeObject(value)
serOut.close()
}
@@ -103,7 +103,7 @@ private object HttpBroadcast extends Logging {
new FastBufferedInputStream(new URL(url).openStream(), bufferSize)
}
val ser = SparkEnv.get.serializer.newInstance()
- val serIn = ser.inputStream(in)
+ val serIn = ser.deserializeStream(in)
val obj = serIn.readObject[T]()
serIn.close()
obj