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

Aeron 1.7.0

Browse source
This commit is contained in:
Patrik Nordwall 2017-12-17 17:34:07 +01:00
parent f6b01f43f1
commit 905e61664b
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
View file

@ -17,6 +17,7 @@ import scala.concurrent.{ Await, Future, Promise }
import scala.concurrent.duration._ import scala.concurrent.duration._
import scala.util.Failure import scala.util.Failure
import scala.util.Success import scala.util.Success
import scala.util.Try
import scala.util.control.NoStackTrace import scala.util.control.NoStackTrace
import scala.util.control.NonFatal import scala.util.control.NonFatal
@ -59,7 +60,7 @@ import io.aeron.exceptions.DriverTimeoutException
import org.agrona.{ DirectBuffer, ErrorHandler, IoUtil } import org.agrona.{ DirectBuffer, ErrorHandler, IoUtil }
import org.agrona.concurrent.BackoffIdleStrategy import org.agrona.concurrent.BackoffIdleStrategy
import akka.remote.artery.Decoder.InboundCompressionAccess import akka.remote.artery.Decoder.InboundCompressionAccess
import io.aeron.driver.status.ChannelEndpointStatus import io.aeron.status.ChannelEndpointStatus
import org.agrona.collections.IntObjConsumer import org.agrona.collections.IntObjConsumer
import org.agrona.concurrent.status.CountersReader.MetaData import org.agrona.concurrent.status.CountersReader.MetaData
@ -880,7 +881,7 @@ private[remote] class ArteryTransport(_system: ExtendedActorSystem, _provider: R
if (hasBeenShutdown.compareAndSet(false, true)) { if (hasBeenShutdown.compareAndSet(false, true)) {
log.debug("Shutting down [{}]", localAddress) log.debug("Shutting down [{}]", localAddress)
if (system.settings.JvmShutdownHooks) if (system.settings.JvmShutdownHooks)
Runtime.getRuntime.removeShutdownHook(shutdownHook) Try(Runtime.getRuntime.removeShutdownHook(shutdownHook)) // may throw if shutdown already in progress
val allAssociations = associationRegistry.allAssociations val allAssociations = associationRegistry.allAssociations
val flushing: Future[Done] = val flushing: Future[Done] =
if (allAssociations.isEmpty) Future.successful(Done) if (allAssociations.isEmpty) Future.successful(Done)

2
akka-remote/src/test/java/akka/remote/artery/AeronStat.java
View file

@ -25,7 +25,7 @@ import java.util.regex.Pattern;
import io.aeron.CncFileDescriptor; import io.aeron.CncFileDescriptor;
import io.aeron.CommonContext; import io.aeron.CommonContext;
import io.aeron.driver.status.ChannelEndpointStatus; import io.aeron.status.ChannelEndpointStatus;
import org.agrona.DirectBuffer; import org.agrona.DirectBuffer;
import org.agrona.IoUtil; import org.agrona.IoUtil;
import org.agrona.concurrent.status.CountersReader; import org.agrona.concurrent.status.CountersReader;

2
project/Dependencies.scala
View file

@ -17,7 +17,7 @@ object Dependencies {
val sslConfigVersion = "0.2.2" val sslConfigVersion = "0.2.2"
val slf4jVersion = "1.7.25" val slf4jVersion = "1.7.25"
val scalaXmlVersion = "1.0.6" val scalaXmlVersion = "1.0.6"
val aeronVersion = "1.3.0" val aeronVersion = "1.7.0"
val Versions = Seq( val Versions = Seq(
crossScalaVersions := Seq("2.11.12", "2.12.4"), crossScalaVersions := Seq("2.11.12", "2.12.4"),