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

[vfs] IJPL-248377: check directory is valid before resolving child

Browse Source 
+ Doesn't fix the issue completely but reduces it's frequency


(cherry picked from commit 9e7223e16153e3a84f4e4b076d390cc150c0bd78)

IJ-CR-211437

GitOrigin-RevId: 9040dd2e46e387f886697ea7ae5d8e1cff979c32
This commit is contained in:
Ruslan Cheremin
2026-07-06 19:03:21 +00:00
committed by intellij-monorepo-bot
parent 5e6ec662ff
commit 264496f7ce
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+13 -2
View File
@@ -231,6 +231,14 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
boolean isCaseSensitive) {
VirtualFileSystemEntry newlyLoadedChild;
synchronized (directoryData) {
VfsData vfsData = getVfsData();
if (!vfsData.isFileValid(getId()) ) {
//Accessing !valid file must be filtered above, but some VFS ops are still executed outside RA/WA framework
// => vfile could be deleted concurrently => re-check it here, before potentially doing something unnatural
// to dead file's .children:
return null;
}
// usually we come here after unsuccessful findInCachedChildren() -- but maybe another findChild() sneaked in the middle?
VirtualFileSystemEntry existingChild = findInCachedChildren(name, isCaseSensitive);
if (existingChild != null) return existingChild; // including NULL_VIRTUAL_FILE
@@ -238,7 +246,6 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
return null;//all children loaded, but child not found -> not exist
}
VfsData vfsData = getVfsData();
PersistentFSImpl pFS = vfsData.owningPersistentFS();
ChildInfo childInfo = pFS.findChildInfo(this, name, fileSystem);
if (childInfo == null) {
@@ -905,6 +912,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
String childName = child.getName();
synchronized (directoryData) {
//MAYBE RC: check directory is not yet invalidated (.isValid())?
directoryData.removeAdoptedName(childName);
VfsData.ChildrenIds children = directoryData.children;
@@ -1082,6 +1090,9 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
@Override
public void invalidate(@NotNull Object source, @NotNull Object reason) {
super.invalidate(source, reason);
//MAYBE RC: how to protect from modifying already invalidated file:
// create a new INVALIDATED flag, and ChildrenIds.INVALIDATED_CHILDREN=ChildrenIds(empty,INVALIDATED)
// check the flag in each ChildrenIds modification methods?
directoryData.children = VfsData.ChildrenIds.EMPTY;
}
@@ -1199,7 +1210,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
if (PersistentFSRecordAccessor.hasDeletedFlag(childAttributes)) {
//It is an error to come here with childId which was already deleted -- such childId should be removed from ChildrenIds
// list first, see PersistentFSImpl.executeDelete()
throw new FileDeletedException(childId, "file is deleted, but still in [" + getId() + "].children list.");
throw new FileDeletedException(childId, "file is deleted, but still in [" + getId() + "].children list " + directoryData.children);
}
int childNameId = vfsPeer.getNameIdByFileId(childId);