From 1de2588abda8dea28d7d050f9c57c20ee84a7563 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Fri, 22 May 2020 13:22:24 -0600
Subject: [PATCH] fix null dereference issue
---
.../gov/usgs/earthquake/nshmp/www/services/ServletUtil.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java
index 03681ea50..aa0ad2b1c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/ServletUtil.java
@@ -196,11 +196,13 @@ public class ServletUtil {
@Override
public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
- if (MODEL_INFO.equals(path.getFileName().toString())) {
+ var fileName = path.getFileName();
+
+ if (fileName != null && fileName.toString().equals(MODEL_INFO)) {
paths.add(path.getParent());
}
- return FileVisitResult.CONTINUE;
+ return FileVisitResult.CONTINUE;
}
}
--
GitLab