1 files changed, 17 insertions, 49 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/ForPathTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/ForPathTest.java
index eaee8bb4b9..f9eb8a7df1 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/ForPathTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/ForPathTest.java
@@ -1,45 +1,12 @@
 /*
  * Copyright (C) 2011, Garmin International
- * Copyright (C) 2011, Jesse Greenwald <jesse.greenwald@gmail.com>
- * and other copyright owners as documented in the project's IP log.
+ * Copyright (C) 2011, Jesse Greenwald <jesse.greenwald@gmail.com> and others
  *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * https://www.eclipse.org/org/documents/edl-v10.php.
  *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 package org.eclipse.jgit.treewalk;
@@ -84,21 +51,22 @@ public class ForPathTest extends RepositoryTestCase {
 			ObjectId tree = tree0.writeTree(oi);
 
 			// Find the directories that were implicitly created above.
-			TreeWalk tw = new TreeWalk(or);
-			tw.addTree(tree);
 			ObjectId a = null;
 			ObjectId aSlashC = null;
-			while (tw.next()) {
-				if (tw.getPathString().equals("a")) {
-					a = tw.getObjectId(0);
-					tw.enterSubtree();
-					while (tw.next()) {
-						if (tw.getPathString().equals("a/c")) {
-							aSlashC = tw.getObjectId(0);
-							break;
+			try (TreeWalk tw = new TreeWalk(or)) {
+				tw.addTree(tree);
+				while (tw.next()) {
+					if (tw.getPathString().equals("a")) {
+						a = tw.getObjectId(0);
+						tw.enterSubtree();
+						while (tw.next()) {
+							if (tw.getPathString().equals("a/c")) {
+								aSlashC = tw.getObjectId(0);
+								break;
+							}
 						}
+						break;
 					}
-					break;
 				}
 			}