brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a deadlock in IpNeighbourMonitor

Browse Source
This commit is contained in:
Mygod
2018-10-08 12:59:38 +08:00
parent c057785306
commit 26043bdefc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
View File

@@ -3,10 +3,12 @@ package be.mygod.vpnhotspot.net.monitor
import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.net.IpNeighbour import be.mygod.vpnhotspot.net.IpNeighbour
import java.net.InetAddress import java.net.InetAddress
import java.util.*
import java.util.concurrent.ConcurrentHashMap
class IpNeighbourMonitor private constructor() : IpMonitor() { class IpNeighbourMonitor private constructor() : IpMonitor() {
companion object { companion object {
private val callbacks = HashSet<Callback>() private val callbacks = Collections.newSetFromMap(ConcurrentHashMap<Callback, Boolean>())
var instance: IpNeighbourMonitor? = null var instance: IpNeighbourMonitor? = null
fun registerCallback(callback: Callback) = synchronized(this) { fun registerCallback(callback: Callback) = synchronized(this) {
@@ -65,10 +67,8 @@ class IpNeighbourMonitor private constructor() : IpMonitor() {
updatePosted = false updatePosted = false
neighbours.values.toList() neighbours.values.toList()
} }
synchronized(IpNeighbourMonitor) {
for (callback in callbacks) callback.onIpNeighbourAvailable(neighbours) for (callback in callbacks) callback.onIpNeighbourAvailable(neighbours)
} }
}
updatePosted = true updatePosted = true
} }
} }