diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2010-08-13 01:47:17 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2010-08-13 01:47:17 +0200 |
| commit | 35b01dac4c81542b195169e3b7365c12a165232c (patch) | |
| tree | a92ea2cc1acc0b1f92cdaf3655da8505a51e346d /org.eclipse.jgit/src/org/eclipse/jgit/revwalk | |
| parent | cfe88d32a3be5e34091092dbaa7900b51e60d482 (diff) | |
| download | jgit-35b01dac4c81542b195169e3b7365c12a165232c.tar.gz jgit-35b01dac4c81542b195169e3b7365c12a165232c.zip | |
Fix RevCommitList to work with subclasses of RevWalk
Bug: 321502
Change-Id: Ic4bc49a0da90234271aea7c0a4e344a1c3620cfc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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; } |