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: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
986d616ed4
commit
0d94a5ca66
|
@ -371,6 +371,7 @@ public String getPathString() {
|
||||||
public void dispose() {
|
public void dispose() {
|
||||||
super.dispose();
|
super.dispose();
|
||||||
pendingObjects = new BlockObjQueue();
|
pendingObjects = new BlockObjQueue();
|
||||||
|
treeWalk = new CanonicalTreeParser();
|
||||||
nextSubtree = null;
|
nextSubtree = null;
|
||||||
currentTree = null;
|
currentTree = null;
|
||||||
}
|
}
|
||||||
|
@ -379,6 +380,7 @@ public void dispose() {
|
||||||
protected void reset(final int retainFlags) {
|
protected void reset(final int retainFlags) {
|
||||||
super.reset(retainFlags);
|
super.reset(retainFlags);
|
||||||
pendingObjects = new BlockObjQueue();
|
pendingObjects = new BlockObjQueue();
|
||||||
|
treeWalk = new CanonicalTreeParser();
|
||||||
nextSubtree = null;
|
nextSubtree = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue