MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] Fix deadlock for the ExternalStorageConfigurationManagerImpl component initialization from the AWT and background thread

Browse Source 
GitOrigin-RevId: 3f919a1c185aedb070642fe6a53caa7fb12375a5
This commit is contained in:
Mikhail Mazurkevich
2021-04-09 14:49:51 +00:00
committed by intellij-monorepo-bot
parent d8d61b8c41
commit 23fcadafc1
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/src/ExternalStorageConfigurationManagerImpl.kt
+12 -18
View File
@@ -28,34 +28,28 @@ internal class ExternalStorageConfigurationManagerImpl(private val project: Proj
*/
override fun setEnabled(value: Boolean) {
state.enabled = value
updateEntitySource()
if (project.isDefault || !WorkspaceModel.isEnabled) return
val app = ApplicationManager.getApplication()
app.invokeAndWait { app.runWriteAction(::updateEntitySource) }
}
override fun loadState(state: ExternalStorageConfiguration) {
super.loadState(state)
updateEntitySource()
if (project.isDefault || !WorkspaceModel.isEnabled) return
val app = ApplicationManager.getApplication()
app.invokeLater { app.runWriteAction(::updateEntitySource) }
}
private fun updateEntitySource() {
val value = state.enabled
if (project.isDefault || !WorkspaceModel.isEnabled) return
val runnable = Runnable {
WorkspaceModel.getInstance(project).updateProjectModel { updater ->
val entitiesMap = updater.entitiesBySource { it is JpsImportedEntitySource && it.storedExternally != value }
entitiesMap.values.asSequence().flatMap { it.values.asSequence().flatMap { entities -> entities.asSequence() } }.forEach { entity ->
val source = entity.entitySource
if (source is JpsImportedEntitySource) {
updater.changeSource(entity, JpsImportedEntitySource(source.internalFile, source.externalSystemId, value))
}
WorkspaceModel.getInstance(project).updateProjectModel { updater ->
val entitiesMap = updater.entitiesBySource { it is JpsImportedEntitySource && it.storedExternally != value }
entitiesMap.values.asSequence().flatMap { it.values.asSequence().flatMap { entities -> entities.asSequence() } }.forEach { entity ->
val source = entity.entitySource
if (source is JpsImportedEntitySource) {
updater.changeSource(entity, JpsImportedEntitySource(source.internalFile, source.externalSystemId, value))
}
}
}
val app = ApplicationManager.getApplication()
if (!app.isDispatchThread && app.isReadAccessAllowed) {
app.invokeLater { app.runWriteAction(runnable) }
}
else {
WriteAction.runAndWait<RuntimeException> { runnable.run() }
}
}
}
platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorageTest.kt
+6
View File
@@ -531,6 +531,9 @@ class ExternalSystemStorageTest {
VfsUtil.markDirtyAndRefresh(false, false, false, miscFile)
StoreReloadManager.getInstance().flushChangedProjectFileAlarm()
}
ApplicationManager.getApplication().invokeAndWait{
PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
}
}
}
@@ -550,6 +553,9 @@ class ExternalSystemStorageTest {
VfsUtil.markDirtyAndRefresh(false, false, false, miscFile)
StoreReloadManager.getInstance().flushChangedProjectFileAlarm()
}
ApplicationManager.getApplication().invokeAndWait{
PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
}
}
}