merged with upstream
This commit is contained in:
parent
565446d2fd
commit
19ac69fda4
1 changed files with 8 additions and 2 deletions
|
|
@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicReference
|
|||
import java.util.concurrent.{ScheduledFuture, ConcurrentHashMap, TimeUnit}
|
||||
import java.util.{Map => JMap}
|
||||
import java.lang.reflect.Field
|
||||
|
||||
import scala.reflect.BeanProperty
|
||||
|
||||
import com.google.protobuf.ByteString
|
||||
|
|
@ -1261,7 +1262,12 @@ class LocalActorRef private[akka](
|
|||
if (topLevelTransaction) clearTransactionSet
|
||||
|
||||
if (supervisor.isDefined) notifySupervisorWithMessage(Exit(this, reason))
|
||||
else lifeCycle match { case Some(LifeCycle(Temporary)) => shutDownTemporaryActor(this) }
|
||||
else {
|
||||
lifeCycle match {
|
||||
case Some(LifeCycle(Temporary)) => shutDownTemporaryActor(this)
|
||||
case _ =>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private def notifySupervisorWithMessage(notification: LifeCycleMessage) = {
|
||||
|
|
@ -1675,4 +1681,4 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef =>
|
|||
*/
|
||||
def spawnLinkRemote[T <: Actor : Manifest](hostname: String, port: Int): ActorRef =
|
||||
spawnLinkRemote(manifest[T].erasure.asInstanceOf[Class[_ <: Actor]],hostname,port)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue