From a1e15fea1240f3678f389fd7df621622a1886b0c Mon Sep 17 00:00:00 2001 From: johnniang Date: Tue, 5 Mar 2019 17:45:58 +0800 Subject: [PATCH] Fix NPE on HaloUtils.getDefaultQiniuZone method(issue: #110) --- src/main/java/cc/ryanc/halo/utils/HaloUtils.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java index d609b976b..292c5fe00 100755 --- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java +++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java @@ -62,9 +62,15 @@ public class HaloUtils { */ @NonNull public static Zone getDefaultQiniuZone() { - Zone zone; // Get zone from setting String qiniuZone = OPTIONS.get("qiniu_zone"); + + if (StrUtil.isBlank(qiniuZone)) { + return Zone.autoZone(); + } + + Zone zone; + switch (qiniuZone) { case "z0": zone = Zone.zone0();