MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Improve loading state check in processEntries

Browse Source 
Added a check for the COMPONENTS_LOADED loading state in the processEntries method of MappedFileTypeIndex. This change is meant to help prevent NPE before all components are fully loaded, leading to potential race conditions.

GitOrigin-RevId: 470d0fa14a4219a75a12d990551af1768bc4d76a
This commit is contained in:
Vladimir Krivosheev
2023-08-21 09:24:10 +03:00
committed by intellij-monorepo-bot
parent 1558ebcc44
commit da68efa365
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/lang-impl/src/com/intellij/psi/search/MappedFileTypeIndex.java
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.psi.search;
import com.intellij.diagnostic.LoadingState;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
@@ -368,12 +369,13 @@ public final class MappedFileTypeIndex extends FileTypeIndexImplBase {
@Override
public void processEntries(@NotNull EntriesProcessor processor) throws StorageException {
try {
boolean isReadAction = ApplicationManager.getApplication().isReadAccessAllowed();
boolean isCheckCanceledNeeded = LoadingState.COMPONENTS_LOADED.isOccurred() &&
ApplicationManager.getApplication().isReadAccessAllowed();
final int bufferSize = DEFAULT_FULL_SCAN_BUFFER_BYTES;
final ByteBuffer buffer = ByteBuffer.allocate(bufferSize);
for (int i = 0; i < myElementsCount; ) {
if (isReadAction) {
if (isCheckCanceledNeeded) {
ProgressManager.checkCanceled();
}
buffer.clear();