Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix FinatraServer register for AbstractFinatraController type change #19

Merged
merged 1 commit into from
Jul 20, 2012
Merged

Fix FinatraServer register for AbstractFinatraController type change #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/com/twitter/finatra/FinatraServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.jboss.netty.handler.codec.http.{HttpRequest, HttpResponse}

object FinatraServer extends Logging {

val controllers = new ControllerCollection[Request, Response, Future[HttpResponse]]
val controllers = new ControllerCollection[Request, Future[Response], Future[HttpResponse]]

var docroot = "public"
var pidPath = "finatra.pid"
Expand All @@ -39,7 +39,7 @@ object FinatraServer extends Logging {
level = Some(Logger.INFO),
handlers = List(logHandler))()

def register(app: AbstractFinatraController[Request, Response, Future[HttpResponse]]) { controllers.add(app) }
def register(app: AbstractFinatraController[Request, Future[Response], Future[HttpResponse]]) { controllers.add(app) }

def shutdown = {
logger.info("shutting down")
Expand Down