raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fixed bug when trying to abort an already committed CommitBarrier

Browse source
This commit is contained in:
Jonas Bonér 2010-07-18 07:28:56 +02:00
parent 2cdfdb2e26
commit 5447520880
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-core/src/main/scala/actor/ActorRef.scala
View file

@ -1189,9 +1189,11 @@ sealed class LocalActorRef private[akka](
// abort transaction set // abort transaction set
if (isTransactionSetInScope) { if (isTransactionSetInScope) {
val txSet = getTransactionSetInScope val txSet = getTransactionSetInScope
if (!txSet.isCommitted) {
Actor.log.debug("Aborting transaction set [%s]", txSet) Actor.log.debug("Aborting transaction set [%s]", txSet)
txSet.abort txSet.abort
} }
}
senderFuture.foreach(_.completeWithException(this, reason)) senderFuture.foreach(_.completeWithException(this, reason))

2
akka-core/src/main/scala/remote/RemoteServer.scala
View file

@ -222,7 +222,7 @@ class RemoteServer extends Logging {
bootstrap.releaseExternalResources bootstrap.releaseExternalResources
Cluster.deregisterLocalNode(hostname, port) Cluster.deregisterLocalNode(hostname, port)
} catch { } catch {
case e: java.nio.channels.ClosedChannelException => log.warning("Could not close remote server channel in a graceful way") case e => log.warning("Could not close remote server channel in a graceful way")
} }
} }
} }