From 1ed6353962296a3f70d6673d68dc4784f2766c4e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 4 Dec 2020 01:51:37 +0100 Subject: [PATCH] [spotbugs] Fix potential NPE in PackFileSnapshotTest Path#getFileName can return null. Fix the warning by asserting the file name isn't null. Change-Id: I7f2fe75b46113d8be1d14e3f18dd77da27df25ed Signed-off-by: Matthias Sohn --- .../jgit/internal/storage/file/PackFileSnapshotTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java index ac65c3362..1f1e09438 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java @@ -11,6 +11,7 @@ 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 void testDetectModificationAlthoughSameSizeAndModificationtimeAndFileKey( // 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());