Browse Source

Merge "RevWalk: Don't reset ObjectReader when stopping"

stable-0.12
Chris Aniszczyk 14 years ago committed by Code Review
parent
commit
e22cbd1847
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java
  2. 1
      org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java

3
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java

@ -129,8 +129,6 @@ class PendingGenerator extends Generator {
final RevCommit c = pending.next(); final RevCommit c = pending.next();
if (c == null) { if (c == null) {
walker.reader.walkAdviceEnd(); walker.reader.walkAdviceEnd();
if (!(walker instanceof ObjectWalk))
walker.reader.release();
return null; return null;
} }
@ -179,7 +177,6 @@ class PendingGenerator extends Generator {
} }
} catch (StopWalkException swe) { } catch (StopWalkException swe) {
walker.reader.walkAdviceEnd(); walker.reader.walkAdviceEnd();
walker.reader.release();
pending.clear(); pending.clear();
return null; return null;
} }

1
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java

@ -1181,7 +1181,6 @@ public class RevWalk implements Iterable<RevCommit> {
} }
} }
reader.release();
roots.clear(); roots.clear();
queue = new DateRevQueue(); queue = new DateRevQueue();
pending = new StartGenerator(this); pending = new StartGenerator(this);

Loading…
Cancel
Save