| commit | fb45137a7ca2d4f56ffd1a799c44a9e0d1c7e40c | [log] [tgz] |
|---|---|---|
| author | Jonathan Nieder <jrn@google.com> | Mon Mar 02 13:37:59 2020 -0500 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Mon Mar 02 13:37:59 2020 -0500 |
| tree | 0c99a303abf7b1d5339533a0f17319713e6a70fd | |
| parent | 8f961240f11340009ab86914e67cd2104c46f28d [diff] | |
| parent | 7ba261fb5f516dce83adc6f3bd4ac1666a51193e [diff] |
Merge "ObjectWalk: Add null check before skip tree."
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java index a3bfb71..da7b266 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
@@ -216,4 +216,12 @@ assertSame(rw.lookupBlob(bId), objw.nextObject()); assertNull(objw.nextObject()); } + + @Test + public void testSkipTreeWhenStartFromBlob() throws Exception { + final RevBlob f1 = blob("1"); + objw.markStart(f1); + assertSame(f1, objw.nextObject()); + objw.skipTree(); + } }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index 21ce78e..04a4b4c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -364,7 +364,9 @@ * @since 5.4 */ public void skipTree() { - currVisit.ptr = currVisit.buf.length; + if (currVisit != null) { + currVisit.ptr = currVisit.buf.length; + } } /**