Skip to content
Snippets Groups Projects
Commit 0d94a5ca authored by Shawn Pearce's avatar Shawn Pearce
Browse files

Ensure the tree parser resets in ObjectWalk


During dispose() or reset() we are suppose to be restoring the
ObjectWalk instance back to the original pre-walk state, but we
failed to reset the tree parser.  This can lead to confusing state
if the ObjectWalk was reused by the caller, as entries from the
old walk might be reported as part of the new walk.

Change-Id: I6237bae7bfd3794e8b9a92b4dd475559cc72e634
Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
parent 986d616e
Branches
Tags
No related merge requests found
......@@ -371,6 +371,7 @@ public String getPathString() {
public void dispose() {
super.dispose();
pendingObjects = new BlockObjQueue();
treeWalk = new CanonicalTreeParser();
nextSubtree = null;
currentTree = null;
}
......@@ -379,6 +380,7 @@ public void dispose() {
protected void reset(final int retainFlags) {
super.reset(retainFlags);
pendingObjects = new BlockObjQueue();
treeWalk = new CanonicalTreeParser();
nextSubtree = null;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment