- Using the new Cache implementation.

2 files changed, 3 insertions, 7 deletions

diff --git a/src/scala/spark/BitTorrentBroadcast.scala b/src/scala/spark/BitTorrentBroadcast.scala
index 7dc376a3c5..60bed8511d 100644
--- a/src/scala/spark/BitTorrentBroadcast.scala
+++ b/src/scala/spark/BitTorrentBroadcast.scala
@@ -1,7 +1,5 @@
 package spark
 
-import com.google.common.collect.MapMaker
-
 import java.io._
 import java.net._
 import java.util.{BitSet, Comparator, Random, Timer, TimerTask, UUID}
@@ -150,7 +148,7 @@ extends Broadcast  with Logging {
           BitTorrentBroadcast.values.put (uuid, value_)
         }  else {
           // TODO: This part won't work, cause HDFS writing is turned OFF
-          val fileIn = new ObjectInputStream(BroadcastCH.openFileForReading(uuid))
+          val fileIn = new ObjectInputStream(DfsBroadcast.openFileForReading(uuid))
           value_ = fileIn.readObject.asInstanceOf[T]
           BitTorrentBroadcast.values.put(uuid, value_)
           fileIn.close
@@ -1028,7 +1026,7 @@ extends Broadcast  with Logging {
 
 private object BitTorrentBroadcast
 extends Logging {
-  val values = new MapMaker ().softValues ().makeMap[UUID, Any]
+  val values = Cache.newKeySpace()
 
   var valueToGuideMap = Map[UUID, SourceInfo] ()
   
diff --git a/src/scala/spark/DfsBroadcast.scala b/src/scala/spark/DfsBroadcast.scala
index 5be5f98e8c..a249961fd5 100644
--- a/src/scala/spark/DfsBroadcast.scala
+++ b/src/scala/spark/DfsBroadcast.scala
@@ -1,7 +1,5 @@
 package spark
 
-import com.google.common.collect.MapMaker
-
 import java.io._
 import java.net._
 import java.util.UUID
@@ -56,7 +54,7 @@ extends Broadcast with Logging {
 
 private object DfsBroadcast
 extends Logging {
-  val values = new MapMaker ().softValues ().makeMap[UUID, Any]
+  val values = Cache.newKeySpace()
 
   private var initialized = false