raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

move Duration classes according to scala 2.10 nightly and remove casts to FiniteDuration, see #2504

Browse source
This commit is contained in:
Roland 2012-09-21 14:50:06 +02:00
parent 6f70624ddd
commit 0f04239f67
227 changed files with 307 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
View file

@ -7,8 +7,7 @@ import akka.event.Logging
import akka.camel.{ CamelSettings, Camel }
import akka.camel.internal.ActivationProtocol._
import scala.util.control.NonFatal
import scala.concurrent.util.Duration
import scala.concurrent.util.FiniteDuration
import scala.concurrent.duration._
import org.apache.camel.ProducerTemplate
import concurrent.{ Future, ExecutionContext }
import akka.util.Timeout
@ -99,4 +98,4 @@ private[camel] class DefaultCamel(val system: ExtendedActorSystem) extends Camel
case EndpointDeActivated(`endpoint`) ⇒ endpoint
case EndpointFailedToDeActivate(`endpoint`, cause) ⇒ throw cause
})
}
}