From ee57ef564c886978ca685af270e6bdcc958b8de8 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 13 Oct 2011 13:53:09 +0200 Subject: [PATCH] fix akka-docs compilation, remove duplicate applications from STM tests --- akka-http/src/main/scala/akka/http/JettyContinuation.scala | 2 +- akka-http/src/main/scala/akka/http/Mist.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-http/src/main/scala/akka/http/JettyContinuation.scala b/akka-http/src/main/scala/akka/http/JettyContinuation.scala index 8fcd6b21a9..6d03d24636 100644 --- a/akka-http/src/main/scala/akka/http/JettyContinuation.scala +++ b/akka-http/src/main/scala/akka/http/JettyContinuation.scala @@ -16,7 +16,7 @@ import akka.AkkaApplication */ trait JettyContinuation extends ContinuationListener { import javax.servlet.http.HttpServletResponse - + def app: AkkaApplication val builder: () ⇒ tAsyncRequestContext diff --git a/akka-http/src/main/scala/akka/http/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala index 6d530ad0f3..06eafdf650 100644 --- a/akka-http/src/main/scala/akka/http/Mist.scala +++ b/akka-http/src/main/scala/akka/http/Mist.scala @@ -294,7 +294,7 @@ class RootEndpoint extends Actor with Endpoint { trait RequestMethod { import java.io.IOException import javax.servlet.http.{ HttpServletResponse, HttpServletRequest } - + def app: AkkaApplication // required implementations