diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-08-12 19:48:44 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-08-12 19:48:44 -0400 |
| commit | 8d761febc3dd3fc3e0258a17526f6479757637f6 (patch) | |
| tree | 2d89fe7acf5f96485684a29fe47aab4f1ee00000 /org.eclipse.jgit/src/org/eclipse/jgit/revwalk | |
| parent | cd1141cd45e8148c2d3fc5553ae19c9fee3fc4a6 (diff) | |
| parent | 35b01dac4c81542b195169e3b7365c12a165232c (diff) | |
| download | jgit-8d761febc3dd3fc3e0258a17526f6479757637f6.tar.gz jgit-8d761febc3dd3fc3e0258a17526f6479757637f6.zip | |
Merge "Fix RevCommitList to work with subclasses of RevWalk"
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/revwalk')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java index 906f27c53d..753cbad5ff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java @@ -302,16 +302,13 @@ public class RevCommitList<E extends RevCommit> extends RevObjectList<E> { if (walker == null || size > highMark) return; - Generator p = walker.pending; - RevCommit c = p.next(); + RevCommit c = walker.next(); if (c == null) { - walker.pending = EndGenerator.INSTANCE; walker = null; return; } enter(size, (E) c); add((E) c); - p = walker.pending; while (size <= highMark) { int index = size; @@ -331,9 +328,8 @@ public class RevCommitList<E extends RevCommit> extends RevObjectList<E> { final Object[] dst = s.contents; while (size <= highMark && index < BLOCK_SIZE) { - c = p.next(); + c = walker.next(); if (c == null) { - walker.pending = EndGenerator.INSTANCE; walker = null; return; } |