From c3ac262d24a69470bcd500ff8ab9bc167d9c69a3 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Sat, 24 Dec 2016 00:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96cache=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/hswebframework/web/bean/config/ConfigBean.java | 1 - .../org/hswebframework/web/bean/config/SimpleConfigBean.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/ConfigBean.java b/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/ConfigBean.java index c9628c961..09e407172 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/ConfigBean.java +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/ConfigBean.java @@ -21,7 +21,6 @@ package org.hswebframework.web.bean.config; import org.hswebframework.web.commons.beans.GenericBean; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/SimpleConfigBean.java b/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/SimpleConfigBean.java index 40f53bfc5..9e4e3e309 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/SimpleConfigBean.java +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-bean/src/main/java/org/hswebframework/web/bean/config/SimpleConfigBean.java @@ -91,7 +91,9 @@ public class SimpleConfigBean extends SimpleGenericBean implements Confi if (cache == null) { synchronized (this) { if (cache == null) { - if (content == null || content.isEmpty()) cache = new HashMap<>(); + if (content == null || content.isEmpty()) { + return null; + } cache = content.stream() .collect(Collectors.toMap(ConfigContent::getKey, content -> content)); }