Merge "Fixed FileTreeIteratorWithTimeControl"
This commit is contained in:
commit
a9c0883ede
|
@ -65,7 +65,7 @@
|
||||||
* This class was written especially to test racy-git problems
|
* This class was written especially to test racy-git problems
|
||||||
*/
|
*/
|
||||||
public class FileTreeIteratorWithTimeControl extends FileTreeIterator {
|
public class FileTreeIteratorWithTimeControl extends FileTreeIterator {
|
||||||
private TreeSet<Long> modTimes = new TreeSet<Long>();
|
private TreeSet<Long> modTimes;
|
||||||
|
|
||||||
public FileTreeIteratorWithTimeControl(FileTreeIterator p, Repository repo,
|
public FileTreeIteratorWithTimeControl(FileTreeIterator p, Repository repo,
|
||||||
TreeSet<Long> modTimes) {
|
TreeSet<Long> modTimes) {
|
||||||
|
@ -99,7 +99,9 @@ public AbstractTreeIterator createSubtreeIterator(final ObjectReader reader) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getEntryLastModified() {
|
public long getEntryLastModified() {
|
||||||
Long cutOff = Long.valueOf(super.getEntryLastModified());
|
if (modTimes == null)
|
||||||
|
return 0;
|
||||||
|
Long cutOff = Long.valueOf(super.getEntryLastModified() + 1);
|
||||||
SortedSet<Long> head = modTimes.headSet(cutOff);
|
SortedSet<Long> head = modTimes.headSet(cutOff);
|
||||||
return head.isEmpty() ? 0 : head.last().longValue();
|
return head.isEmpty() ? 0 : head.last().longValue();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue