Browse Source

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>
stable-0.7
Shawn O. Pearce 15 years ago
parent
commit
0d94a5ca66
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java

2
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java

@ -371,6 +371,7 @@ public class ObjectWalk extends RevWalk {
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 class ObjectWalk extends RevWalk {
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…
Cancel
Save