summaryrefslogtreecommitdiff
path: root/test/osgi
diff options
context:
space:
mode:
authorVojin Jovanovic <vojin.jovanovic@epfl.ch>2012-09-24 14:58:55 +0200
committerVojin Jovanovic <vojin.jovanovic@epfl.ch>2012-09-25 11:14:46 +0200
commitd69483662a596beb13cf6e128450a1c51881a6f6 (patch)
tree00322ad5e21483a83501fc0b7ecabee6e3a16fc8 /test/osgi
parentdb8dea0055739ec39c8765565c5f479ab360acf9 (diff)
downloadscala-d69483662a596beb13cf6e128450a1c51881a6f6.tar.gz
scala-d69483662a596beb13cf6e128450a1c51881a6f6.tar.bz2
scala-d69483662a596beb13cf6e128450a1c51881a6f6.zip
SI-6305 fix.
Diffstat (limited to 'test/osgi')
-rw-r--r--test/osgi/src/BasicLibrary.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/osgi/src/BasicLibrary.scala b/test/osgi/src/BasicLibrary.scala
index 38dea69e99..6618f02102 100644
--- a/test/osgi/src/BasicLibrary.scala
+++ b/test/osgi/src/BasicLibrary.scala
@@ -29,7 +29,7 @@ class BasicLibraryTest extends ScalaOsgiHelper {
def everythingLoads(): Unit = {
// Note - This tests sun.misc usage.
import scala.concurrent._
- import scala.concurrent.util.Duration.Inf
+ import scala.concurrent.duration.Duration.Inf
import ExecutionContext.Implicits._
val x = Future(2) map (_ + 1)
assertEquals(3, Await.result(x, Inf))