瀏覽代碼

Fixed FileTreeIteratorWithTimeControl

getEntryLastModified returned wrong values for
timestamps on boundaries.

Change-Id: I0457ff030946fda7ecc70671bc65db02a8c206ee
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
tags/v0.9.1
Stefan Lay 14 年之前
父節點
當前提交
d9ceaa2f1e

+ 4
- 2
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java 查看文件

@@ -65,7 +65,7 @@ import org.eclipse.jgit.util.FS;
* This class was written especially to test racy-git problems
*/
public class FileTreeIteratorWithTimeControl extends FileTreeIterator {
private TreeSet<Long> modTimes = new TreeSet<Long>();
private TreeSet<Long> modTimes;

public FileTreeIteratorWithTimeControl(FileTreeIterator p, Repository repo,
TreeSet<Long> modTimes) {
@@ -99,7 +99,9 @@ public class FileTreeIteratorWithTimeControl extends FileTreeIterator {

@Override
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);
return head.isEmpty() ? 0 : head.last().longValue();
}

Loading…
取消
儲存