From 65f8d00ac4bdb7e6a131dcea5f6aa91bbd56d0fd Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 20 Sep 2020 01:32:57 +0800 Subject: [PATCH] Fix race in init --- .../main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt | 2 +- .../be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt index bd454b20..fe21f565 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt @@ -99,7 +99,7 @@ abstract class IpMonitor { } } - init { + protected fun init() { thread(name = "${javaClass.simpleName}-input") { val mode = currentMode if (mode.isMonitor) { diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt index d92f473a..87239548 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt @@ -57,6 +57,10 @@ class IpNeighbourMonitor private constructor() : IpMonitor() { } private var neighbours = persistentMapOf() + init { + init() + } + override val monitoredObject: String get() = "neigh" override fun processLine(line: String) {