From 98f8ad794eee090d9eb72696fd6e7f9ee0b2b463 Mon Sep 17 00:00:00 2001 From: Robinson Date: Thu, 3 Mar 2022 01:23:07 +0100 Subject: [PATCH] update dependencies --- src/dorkbox/network/Configuration.kt | 6 +++--- src/dorkbox/network/serialization/Serialization.kt | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/dorkbox/network/Configuration.kt b/src/dorkbox/network/Configuration.kt index 9333de23..0fcbaa80 100644 --- a/src/dorkbox/network/Configuration.kt +++ b/src/dorkbox/network/Configuration.kt @@ -33,7 +33,7 @@ import org.agrona.SystemUtil import org.agrona.concurrent.AgentTerminationException import java.io.File import java.net.BindException -import java.util.concurrent.TimeUnit +import java.util.concurrent.* class ServerConfiguration : dorkbox.network.Configuration() { companion object { @@ -487,7 +487,7 @@ open class Configuration { */ fun suggestAeronLogLocation(logger: KLogger): File { return when { - OS.isMacOsX() -> { + OS.isMacOsX -> { // does the recommended location exist?? val suggestedLocation = File("/Volumes/DevShm") if (suggestedLocation.exists()) { @@ -499,7 +499,7 @@ open class Configuration { File(System.getProperty("java.io.tmpdir")) } } - OS.isLinux() -> { + OS.isLinux -> { // this is significantly faster for linux than using the temp dir File("/dev/shm/") } diff --git a/src/dorkbox/network/serialization/Serialization.kt b/src/dorkbox/network/serialization/Serialization.kt index c55ce733..dede52d8 100644 --- a/src/dorkbox/network/serialization/Serialization.kt +++ b/src/dorkbox/network/serialization/Serialization.kt @@ -27,7 +27,17 @@ import dorkbox.network.ping.Ping import dorkbox.network.ping.PingSerializer import dorkbox.network.rmi.CachedMethod import dorkbox.network.rmi.RmiUtils -import dorkbox.network.rmi.messages.* +import dorkbox.network.rmi.messages.ConnectionObjectCreateRequest +import dorkbox.network.rmi.messages.ConnectionObjectCreateResponse +import dorkbox.network.rmi.messages.ConnectionObjectDeleteRequest +import dorkbox.network.rmi.messages.ConnectionObjectDeleteResponse +import dorkbox.network.rmi.messages.ContinuationSerializer +import dorkbox.network.rmi.messages.MethodRequest +import dorkbox.network.rmi.messages.MethodRequestSerializer +import dorkbox.network.rmi.messages.MethodResponse +import dorkbox.network.rmi.messages.MethodResponseSerializer +import dorkbox.network.rmi.messages.RmiClientSerializer +import dorkbox.network.rmi.messages.RmiServerSerializer import dorkbox.objectPool.ObjectPool import dorkbox.objectPool.Pool import dorkbox.objectPool.PoolObject @@ -150,7 +160,7 @@ open class Serialization(private val references: Boolean val rmiHolder = RmiHolder() // reflectASM doesn't work on android - private val useAsm = !OS.isAndroid() + private val useAsm = !OS.isAndroid // These are GLOBAL, single threaded only kryo instances. // The readKryo WILL RE-CONFIGURED during the client handshake! (it is all the same thread, so object visibility is not a problem)