motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes I97c062d0,Ib4e1f37c 

* changes:
  Simplify RevWalk#iterator by factoring out common code
  Simplify exception handling in RevWalk#iterator
This commit is contained in:
David Pursehouse 2018-11-08 22:51:48 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent df21eec1ad a0cd400c37
commit 54dd1d112a
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
View File

@ -54,6 +54,7 @@
import java.util.List;
import org.eclipse.jgit.annotations.NonNull;
import org.eclipse.jgit.annotations.Nullable;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.LargeObjectException;
@ -1335,6 +1336,22 @@ public void dispose() {
shallowCommitsInitialized = false;
}
/**
* Like {@link #next()}, but if a checked exception is thrown during the
* walk it is rethrown as a {@link RevWalkException}.
*
* @throws RevWalkException if an {@link IOException} was thrown.
* @return next most recent commit; null if traversal is over.
*/
@Nullable
private RevCommit nextForIterator() {
try {
return next();
} catch (IOException e) {
throw new RevWalkException(e);
}
}
/**
* {@inheritDoc}
* <p>
@ -1353,16 +1370,7 @@ public void dispose() {
*/
@Override
public Iterator<RevCommit> iterator() {
final RevCommit first;
try {
first = RevWalk.this.next();
} catch (MissingObjectException e) {
throw new RevWalkException(e);
} catch (IncorrectObjectTypeException e) {
throw new RevWalkException(e);
} catch (IOException e) {
throw new RevWalkException(e);
}
RevCommit first = nextForIterator();
return new Iterator<RevCommit>() {
RevCommit next = first;
@ -1374,17 +1382,9 @@ public boolean hasNext() {
@Override
public RevCommit next() {
try {
final RevCommit r = next;
next = RevWalk.this.next();
return r;
} catch (MissingObjectException e) {
throw new RevWalkException(e);
} catch (IncorrectObjectTypeException e) {
throw new RevWalkException(e);
} catch (IOException e) {
throw new RevWalkException(e);
}
RevCommit r = next;
next = nextForIterator();
return r;
}
@Override