Merge branch 'master' of http://github.com/jboner/akka
This commit is contained in:
commit
c08fea5cfc
1 changed files with 2 additions and 2 deletions
|
|
@ -1279,11 +1279,11 @@ sealed class LocalActorRef private[akka](
|
|||
case e =>
|
||||
_isBeingRestarted = true
|
||||
// abort transaction set
|
||||
if (isTransactionSetInScope) try {
|
||||
if (isTransactionSetInScope) {
|
||||
val txSet = getTransactionSetInScope
|
||||
Actor.log.debug("Aborting transaction set [%s]", txSet)
|
||||
txSet.abort
|
||||
} catch { case e: IllegalStateException => {} }
|
||||
}
|
||||
Actor.log.error(e, "Exception when invoking \n\tactor [%s] \n\twith message [%s]", this, message)
|
||||
|
||||
senderFuture.foreach(_.completeWithException(this, e))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue