Permalink
Browse files

Fixed a real deadlock

  • Loading branch information...
1 parent a23b88b commit 65bd13474b1522a8d2afbd207e727ced96aecee0 @dpp dpp committed with fmpwizard Jun 2, 2013
Showing with 4 additions and 2 deletions.
  1. +4 −2 web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
@@ -2201,15 +2201,17 @@ class LiftSession(private[http] val _contextPath: String, val uniqueId: String,
/**
* Remove a Comet actor
*/
- private[http] def removeCometActor(act: LiftCometActor): Unit = asyncSync.synchronized {
+ private[http] def removeCometActor(act: LiftCometActor): Unit = {
testStatefulFeature {
+ asyncSync.synchronized {
asyncById -= act.uniqueId
- messageCallback -= act.jsonCall.funcId
asyncComponents -= (act.theType -> act.name)
+ }
val toCmp = Full(act.uniqueId)
msgCallbackSync.synchronized {
+ messageCallback -= act.jsonCall.funcId
messageCallback.foreach {
case (k, f) =>
if (f.owner == toCmp) messageCallback -= k

0 comments on commit 65bd134

Please sign in to comment.