From: Stefan Lay <stefan.lay@sap.com>
Date: Fri, 30 Jul 2010 15:35:29 +0000 (+0200)
Subject: Fixed FileTreeIteratorWithTimeControl
X-Git-Tag: v0.9.1~141^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F1203%2F2;p=jgit.git

Fixed FileTreeIteratorWithTimeControl

getEntryLastModified returned wrong values for
timestamps on boundaries.

Change-Id: I0457ff030946fda7ecc70671bc65db02a8c206ee
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
---

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java
index fc19321c0a..bb76d0075d 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java
+++ b/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();
 	}