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

Remove synchronous VFS refresh to avoid deadlocks (KT-4584)

Browse Source 
#KT-4584 Fixed
This commit is contained in:
Nikolay Krasko
2014-03-31 20:39:25 +04:00
parent 48570ebc64
commit 5606c21f89
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt
+8 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import org.jetbrains.jet.plugin.JetPluginUtil
import com.intellij.util.indexing.FileBasedIndex
import com.intellij.openapi.vfs.LocalFileSystem
import java.io.File
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFileVisitor
import com.intellij.openapi.vfs.newvfs.NewVirtualFile
import com.intellij.openapi.vfs.VfsUtilCore
@@ -33,6 +32,10 @@ import com.intellij.openapi.application.ApplicationManager
private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version"
/**
* Component forces update for built-in libraries in plugin directory. They are ignored because of
* com.intellij.util.indexing.FileBasedIndex.isUnderConfigOrSystem()
*/
class KotlinUpdatePluginComponent : ApplicationComponent {
override fun initComponent() {
if (ApplicationManager.getApplication()?.isUnitTestMode() == true) {
@@ -77,7 +80,8 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
VfsUtilCore.visitChildrenRecursively(jarFile!!, object : VirtualFileVisitor<Any?>() {})
((jarFile as NewVirtualFile)).markDirtyRecursively()
jarFile.refresh(false, true)
VfsUtil.markDirtyAndRefresh(false, false, true, localVirtualFile)
// Synchronous refresh lead to deadlocks during components initialization KT-4584
// jarFile.refresh(true, true)
// VfsUtil.markDirtyAndRefresh(true, false, true, localVirtualFile)
}
}
idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.