azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ScriptClassRootsUpdater, updateSynchronously: cancel before waiting for lock

Browse Source
This commit is contained in:
Sergey Rostov
2020-05-07 15:52:27 +03:00
parent bc0255890d
commit 7de0bc9cdc
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsUpdater.kt
+3 -5
View File
@@ -115,13 +115,11 @@ class ScriptClassRootsUpdater(
@Synchronized @Synchronized
private fun updateSynchronously() { private fun updateSynchronously() {
syncLock.withLock { scheduledUpdate?.cancel()
scheduledUpdate?.cancel() doUpdate(false)
doUpdate(false)
}
} }
fun doUpdate(underProgressManager: Boolean = true) { private fun doUpdate(underProgressManager: Boolean = true) {
syncLock.withLock { syncLock.withLock {
try { try {
val updates = manager.collectRootsAndCheckNew() val updates = manager.collectRootsAndCheckNew()