Permalink
Browse files

Fix #1585

  • Loading branch information...
hvesalai committed Nov 2, 2017
1 parent b2db9e3 commit 436fb556fbcf6bcfc5171d0941a96a691c9dbfaa
Showing with 6 additions and 2 deletions.
  1. +6 −2 slick/src/main/scala/slick/basic/BasicBackend.scala
@@ -186,10 +186,14 @@ trait BasicBackend { self =>
} (DBIO.sameThreadExecutionContext)
} catch {
case NonFatal(ex) =>
throw (t1 match {
val e = t1 match {
case Failure(t) if keepFailure => t
case _ => ex
})
}
if (!p.tryFailure(e)) {
actionLogger.warn("Exception after promise completed", e)
}
}
} (ctx.getEC(ec))
p.future

0 comments on commit 436fb55

Please sign in to comment.