Fix findUrlSuffix NPE when upgrading from old version (#94)

fixes #93 ```release-note 修复从旧版本升级后上传文件的NPE错误 ``` /kind bug
halo-dev · Oct 27, 2023 · 565d3cf · 565d3cf
1 parent c0fb2b1
commit 565d3cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/run/halo/s3os/UrlUtils.java b/src/main/java/run/halo/s3os/UrlUtils.java
@@ -21,7 +21,7 @@ public static String removeHttpPrefix(String url) {
 
  public static String findUrlSuffix(List<S3OsProperties.urlSuffixItem> urlSuffixList,
  String fileName) {
- if (StringUtils.isBlank(fileName)) {
+ if (StringUtils.isBlank(fileName) || urlSuffixList == null) {
  return null;
  }
  fileName = fileName.toLowerCase();

diff --git a/src/test/java/run/halo/s3os/UrlUtilsTest.java b/src/test/java/run/halo/s3os/UrlUtilsTest.java
@@ -46,5 +46,10 @@ public void testFindUrlSuffix() {
  String fileName5 = "";
  String result5 = UrlUtils.findUrlSuffix(urlSuffixList, fileName5);
  assertNull(result5);
+
+ // 测试urlSuffixList为null，期望返回null
+ String fileName6 = "example";
+ String result6 = UrlUtils.findUrlSuffix(null, fileName6);
+ assertNull(result6);
  }
 }