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

[vcs-log] if storage is broken, assertion is meaningless, top commit cache is broken as well

Browse Source 
EA-87308
This commit is contained in:
Julia Beliaeva
2016-10-30 21:38:10 +03:00
parent 8db0558484
commit bb0a246d68
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/data/TopCommitsCache.java
+6 -2
View File
@@ -45,10 +45,14 @@ public class TopCommitsCache {
Iterator<VcsCommitMetadata> it = new MergingIterator(mySortedDetails, newDetails);
List<VcsCommitMetadata> result = ContainerUtil.newArrayList();
boolean isBroken = false;
while (it.hasNext()) {
VcsCommitMetadata detail = it.next();
int index = getIndex(detail);
if (index == VcsLogStorageImpl.NO_INDEX) continue; // means some error happened (and reported) earlier, nothing we can do here
if (index == VcsLogStorageImpl.NO_INDEX) {
isBroken = true;
continue; // means some error happened (and reported) earlier, nothing we can do here
}
if (result.size() < VcsLogData.RECENT_COMMITS_COUNT * 2) {
result.add(detail);
myCache.put(index, detail);
@@ -57,7 +61,7 @@ public class TopCommitsCache {
myCache.remove(index);
}
}
assert result.size() == myCache.size() : result.size() + " details to store, yet " + myCache.size() + " indexes in cache.";
assert result.size() == myCache.size() || isBroken : result.size() + " details to store, yet " + myCache.size() + " indexes in cache.";
mySortedDetails = result;
}