yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-1411 minor correction to filesystem index rebuild

Browse source
This commit is contained in:
ghidra1 2022-07-12 09:38:50 -04:00
parent 83308221e5
commit 3f351eed41
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/IndexedLocalFileSystem.java
View file

@ -588,29 +588,29 @@ public class IndexedLocalFileSystem extends LocalFileSystem {
return false;
}
String conflictedItemStorageName = findItemStorageName(parentPath, name);
String storageName = pfile.getStorageName();
if (conflictedItemStorageName != null) {
try {
if (storageName.compareTo(conflictedItemStorageName) <= 0) {
conflictedItemStorageName = storageName;
return true; // skip conflict orphan
}
// remove conflict orphan from index and, add newer item below
deallocateItemStorage(parentPath, name);
}
finally {
Msg.warn(this,
"Detected orphaned project file " + conflictedItemStorageName + ": " +
getPath(parentPath, name));
}
}
indexJournal.open();
try {
String conflictedItemStorageName = findItemStorageName(parentPath, name);
String storageName = pfile.getStorageName();
if (conflictedItemStorageName != null) {
try {
if (storageName.compareTo(conflictedItemStorageName) <= 0) {
conflictedItemStorageName = storageName;
return true; // skip conflict orphan
}
// remove conflict orphan from index and, add newer item below
deallocateItemStorage(parentPath, name);
}
finally {
Msg.warn(this,
"Detected orphaned project file " + conflictedItemStorageName + ": " +
getPath(parentPath, name));
}
}
Folder folder = addFolderToIndexIfMissing(parentPath);
Item item = new Item(folder, name, pfile.getStorageName());
bumpNextFileIndexID(item.getStorageName());