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

This commit is contained in:
Chris Aniszczyk 2011-02-14 18:13:39 -05:00 committed by Code Review
commit e22cbd1847
2 changed files with 0 additions and 4 deletions

View File

@ -129,8 +129,6 @@ RevCommit next() throws MissingObjectException,
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 @@ else if (canDispose)
} }
} catch (StopWalkException swe) { } catch (StopWalkException swe) {
walker.reader.walkAdviceEnd(); walker.reader.walkAdviceEnd();
walker.reader.release();
pending.clear(); pending.clear();
return null; return null;
} }

View File

@ -1181,7 +1181,6 @@ protected void reset(int retainFlags) {
} }
} }
reader.release();
roots.clear(); roots.clear();
queue = new DateRevQueue(); queue = new DateRevQueue();
pending = new StartGenerator(this); pending = new StartGenerator(this);