Merge pull request #1940 from zhongsigang/master

Changing a method of lift actor.
lift · Mar 29, 2018 · 3ab4cc2 · 3ab4cc2
2 parents b3827c0 + 83f729f
commit 3ab4cc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/core/actor/src/main/scala/net/liftweb/actor/LAFuture.scala b/core/actor/src/main/scala/net/liftweb/actor/LAFuture.scala
@@ -171,7 +171,7 @@ class LAFuture[T](val scheduler: LAScheduler = LAScheduler, context: Box[LAFutur
   /**
    * Has the future been aborted
    */
-  def aborted_? = synchronized {satisfied}
+  def aborted_? = synchronized {aborted}
 
   /**
    * Java-friendly alias for completed_?.

diff --git a/core/actor/src/main/scala/net/liftweb/actor/LiftActor.scala b/core/actor/src/main/scala/net/liftweb/actor/LiftActor.scala
@@ -130,7 +130,6 @@ trait SpecializedLiftActor[T] extends SimpleActor[T]  {
     */
 
     def remove() {
-      val newPrev = prev
       prev.next = next
       next.prev = prev
     }