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

Merge branch 'master' again to get the latest sharding fixes

Browse source
This commit is contained in:
Johan Andrén 2020-06-01 12:50:10 +02:00
commit 5bbf5a5a21
46 changed files with 1478 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
View file

@ -715,7 +715,7 @@ private[akka] class RemoteActorRef private[akka] (
else if (provider.remoteWatcher.isDefined)
remote.send(message, OptionVal.None, this)
else
provider.warnIfUnsafeDeathwatchWithoutCluster(watchee, watcher, "remote Watch")
provider.warnIfUnsafeDeathwatchWithoutCluster(watchee, watcher, "Watch")
//Unwatch has a different signature, need to pattern match arguments against InternalActorRef
case Unwatch(watchee: InternalActorRef, watcher: InternalActorRef) =>

4
akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala
View file

@ -221,7 +221,7 @@ private[akka] class RemoteWatcher(
// add watch from self, this will actually send a Watch to the target when necessary
context.watch(watchee)
} else remoteProvider.warnIfUnsafeDeathwatchWithoutCluster(watcher, watchee, "Watch")
} else remoteProvider.warnIfUnsafeDeathwatchWithoutCluster(watchee, watcher, "Watch")
}
def watchNode(watchee: InternalActorRef): Unit = {
@ -250,7 +250,7 @@ private[akka] class RemoteWatcher(
}
case None =>
}
} else remoteProvider.warnIfUnsafeDeathwatchWithoutCluster(watcher, watchee, "Unwatch")
} else remoteProvider.warnIfUnsafeDeathwatchWithoutCluster(watchee, watcher, "Unwatch")
}
def removeWatchee(watchee: InternalActorRef): Unit = {

6
akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala
View file

@ -6,7 +6,11 @@ package akka.remote.artery
import java.net.InetSocketAddress
import akka.actor.{ Address, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
import akka.actor.Address
import akka.actor.ExtendedActorSystem
import akka.actor.Extension
import akka.actor.ExtensionId
import akka.actor.ExtensionIdProvider
import akka.annotation.InternalApi
import akka.remote.UniqueAddress
import akka.util.FlightRecorderLoader