From bceb202319b6f2b02b15f32db5c40a912e4bd1f3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 4 Dec 2020 23:41:19 +0100 Subject: [PATCH] [spotbugs] Fix potential NPE in FS.FileStoreAttributes#get Path#getParent can return null, return fallback filestore attributes in that case. Change-Id: Ic09484d527bc87b27964b625e07373b82412f2da Signed-off-by: Matthias Sohn --- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 874bfe8735..c80a3a4b7f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -337,6 +337,9 @@ public abstract class FS { try { path = path.toAbsolutePath(); Path dir = Files.isDirectory(path) ? path : path.getParent(); + if (dir == null) { + return FALLBACK_FILESTORE_ATTRIBUTES; + } FileStoreAttributes cached = attrCacheByPath.get(dir); if (cached != null) { return cached; -- 2.39.5