Merge with master

This commit is contained in:
Viktor Klang 2011-03-14 16:29:22 +01:00
commit 5d70243161
3 changed files with 4 additions and 4 deletions

View file

@ -389,7 +389,7 @@ trait RequestMethod {
}
} catch {
case io: Exception =>
EventHandler notifyListeners EventHandler.Error(io, this)
EventHandler notify EventHandler.Error(io, this)
false
}
}
@ -408,7 +408,7 @@ trait RequestMethod {
}
} catch {
case io: IOException =>
EventHandler notifyListeners EventHandler.Error(io, this)
EventHandler notify EventHandler.Error(io, this)
}
}

View file

@ -36,7 +36,7 @@ trait Servlet30Context extends AsyncListener {
}
catch {
case ex: IllegalStateException =>
EventHandler notifyListeners EventHandler.Error(ex, this)
EventHandler notify EventHandler.Error(ex, this)
false
}
}

View file

@ -369,7 +369,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] {
Some(UserInfo(user, null, rolesFor(user)))
} catch {
case e: PrivilegedActionException => {
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
None
}
}