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

=clu #17712 Guard against readView not created

Browse source 
* readView might be null if Cluster init fails before it is created,
  i.e. shutdown is called from constructor
This commit is contained in:
Patrik Nordwall 2015-07-01 14:39:20 +02:00
parent 70403446ce
commit 4bf262a137
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-cluster/src/main/scala/akka/cluster/Cluster.scala
View file

@ -164,7 +164,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
log.error(e, "Failed to startup Cluster. You can try to increase 'akka.actor.creation-timeout'.")
shutdown()
// don't re-throw, that would cause the extension to be re-recreated
// from shutdown() or other places, which may result in
// from shutdown() or other places, which may result in
// InvalidActorNameException: actor name [cluster] is not unique
system.deadLetters
}
@ -362,7 +362,10 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
logInfo("Shutting down...")
system.stop(clusterDaemons)
readView.close()
// readView might be null if init fails before it is created
if (readView != null)
readView.close()
closeScheduler()