diff --git a/akka-http/src/main/scala/akka/http/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala index f144b69f29..6a7adbe2cf 100644 --- a/akka-http/src/main/scala/akka/http/Mist.scala +++ b/akka-http/src/main/scala/akka/http/Mist.scala @@ -5,7 +5,7 @@ package akka.http import akka.actor.{ActorRegistry, ActorRef, Actor} -import akka.actor.{EventHandler} +import akka.actor.EventHandler import javax.servlet.http.{HttpServletResponse, HttpServletRequest} import javax.servlet.http.HttpServlet @@ -389,7 +389,7 @@ trait RequestMethod { } } catch { case io: Exception => - EventHandler notify EventHandler.Error(io, this) + EventHandler.error(io, this, io.getMessage) false } } @@ -408,7 +408,7 @@ trait RequestMethod { } } catch { case io: IOException => - EventHandler notify EventHandler.Error(io, this) + EventHandler.error(io, this, io.getMessage) } } diff --git a/akka-http/src/main/scala/akka/http/Servlet30Context.scala b/akka-http/src/main/scala/akka/http/Servlet30Context.scala index 3bc6c9261b..6ce3d1041c 100644 --- a/akka-http/src/main/scala/akka/http/Servlet30Context.scala +++ b/akka-http/src/main/scala/akka/http/Servlet30Context.scala @@ -7,7 +7,7 @@ package akka.http import javax.servlet. {AsyncContext, AsyncListener, AsyncEvent}; import Types._ -import akka.actor.{EventHandler} +import akka.actor.EventHandler /** * @author Garrick Evans @@ -35,8 +35,8 @@ trait Servlet30Context extends AsyncListener { true } catch { - case ex: IllegalStateException => - EventHandler notify EventHandler.Error(ex, this) + case e: IllegalStateException => + EventHandler.error(e, this, e.getMessage) false } } diff --git a/akka-http/src/main/scala/akka/security/Security.scala b/akka-http/src/main/scala/akka/security/Security.scala index 97b25e1b3e..9f16d54886 100644 --- a/akka-http/src/main/scala/akka/security/Security.scala +++ b/akka-http/src/main/scala/akka/security/Security.scala @@ -23,7 +23,7 @@ package akka.security import akka.actor.{Scheduler, Actor, ActorRef, ActorRegistry, IllegalActorStateException} -import akka.actor.{EventHandler} +import akka.actor.EventHandler import akka.actor.Actor._ import akka.config.Config @@ -369,7 +369,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] { Some(UserInfo(user, null, rolesFor(user))) } catch { case e: PrivilegedActionException => { - EventHandler notify EventHandler.Error(e, this) + EventHandler.error(e, this, e.getMessage) None } }