Browse files

Merge branch '2.2.x_2.9' into 2.2.x_2.10

  • Loading branch information...
2 parents 758c1bc + 04b12c4 commit 3fd4d8652bc75b7308d07bff41bf4df43afc5943 @casualjim casualjim committed Feb 26, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 auth/src/main/scala/org/scalatra/auth/Scentry.scala
View
2 auth/src/main/scala/org/scalatra/auth/Scentry.scala
@@ -77,7 +77,7 @@ class Scentry[UserType <: AnyRef](
Option(_user) orElse {
store.get.blankOption flatMap { key =>
runCallbacks() { _.beforeFetch(key) }
- val o = fromSession lift key map { res =>
+ val o = fromSession lift key flatMap (Option(_)) map { res =>
runCallbacks() { _.afterFetch(res) }
request(scentryAuthKey) = res
res

0 comments on commit 3fd4d86

Please sign in to comment.