]> source.dussan.org Git - jgit.git/commitdiff
[spotbugs] Fix potential NPE in PackFileSnapshotTest 69/173369/5
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 4 Dec 2020 00:51:37 +0000 (01:51 +0100)
committerChristian Halstrick <christian.halstrick@sap.com>
Thu, 17 Dec 2020 17:42:00 +0000 (18:42 +0100)
Path#getFileName can return null. Fix the warning by asserting the file
name isn't null.

Change-Id: I7f2fe75b46113d8be1d14e3f18dd77da27df25ed
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java

index ac65c33621f0110f40ca4e8dd0f048b27fe66edc..1f1e094385df93cb1302c5dd9eaf3efd96974e97 100644 (file)
@@ -11,6 +11,7 @@ package org.eclipse.jgit.internal.storage.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
@@ -208,8 +209,11 @@ public class PackFileSnapshotTest extends RepositoryTestCase {
                // Repack to create initial packfile. Make a copy of it
                PackFile pf = repackAndCheck(5, null, null, null);
                Path packFilePath = pf.getPackFile().toPath();
-               Path packFileBasePath = packFilePath.resolveSibling(
-                               packFilePath.getFileName().toString().replaceAll(".pack", ""));
+               Path fn = packFilePath.getFileName();
+               assertNotNull(fn);
+               String packFileName = fn.toString();
+               Path packFileBasePath = packFilePath
+                               .resolveSibling(packFileName.replaceAll(".pack", ""));
                AnyObjectId chk1 = pf.getPackChecksum();
                String name = pf.getPackName();
                Long length = Long.valueOf(pf.getPackFile().length());