From 68fcbe8562667db5f7d9692ca99d5c064ff49dc0 Mon Sep 17 00:00:00 2001 From: Martin Krasser Date: Fri, 5 Mar 2010 22:18:26 +0100 Subject: [PATCH] fixed compile errors after merging with master --- akka-camel/src/main/scala/Producer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-camel/src/main/scala/Producer.scala b/akka-camel/src/main/scala/Producer.scala index 326f208cfc..cd827ce415 100644 --- a/akka-camel/src/main/scala/Producer.scala +++ b/akka-camel/src/main/scala/Producer.scala @@ -11,7 +11,7 @@ import org.apache.camel.impl.DefaultExchange import org.apache.camel.spi.Synchronization import se.scalablesolutions.akka.actor.Actor -import se.scalablesolutions.akka.dispatch.CompletableFutureResult +import se.scalablesolutions.akka.dispatch.CompletableFuture import se.scalablesolutions.akka.util.Logging /** @@ -166,7 +166,7 @@ trait Producer { class ProducerResponseSender( headers: Map[String, Any], sender: Option[Actor], - senderFuture: Option[CompletableFutureResult], + senderFuture: Option[CompletableFuture], producer: Actor) extends Synchronization with Logging { implicit val producerActor = Some(producer) // the response sender