Skip to content
Snippets Groups Projects
Commit 28e42cb4 authored by Chris Aniszczyk's avatar Chris Aniszczyk Committed by Code Review
Browse files

Merge "Don't insert the same pack twice into a pack list"

parents 11096a89 374c2805
No related branches found
No related tags found
No related merge requests found
......@@ -292,7 +292,20 @@ private void insertPack(final PackFile pf) {
PackList o, n;
do {
o = packList.get();
// If the pack in question is already present in the list
// (picked up by a concurrent thread that did a scan?) we
// do not want to insert it a second time.
//
final PackFile[] oldList = o.packs;
final String name = pf.getPackFile().getName();
for (PackFile p : oldList) {
if (PackFile.SORT.compare(pf, p) < 0)
break;
if (name.equals(p.getPackFile().getName()))
return;
}
final PackFile[] newList = new PackFile[1 + oldList.length];
newList[0] = pf;
System.arraycopy(oldList, 0, newList, 1, oldList.length);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment