From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 12 Aug 2010 23:47:17 +0000 (+0200)
Subject: Fix RevCommitList to work with subclasses of RevWalk
X-Git-Tag: v0.9.1~125^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35b01dac4c81542b195169e3b7365c12a165232c;p=jgit.git

Fix RevCommitList to work with subclasses of RevWalk

Bug: 321502
Change-Id: Ic4bc49a0da90234271aea7c0a4e344a1c3620cfc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

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;
 				}