From dd850c88a036abbb200a73bcad15c33b79d45937 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 19 Nov 2021 13:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jeesite/common/lang/ObjectUtils.java | 4 ++-- .../main/java/com/jeesite/common/reflect/ClassUtils.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java index 2d7f440c..31856a93 100644 --- a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java @@ -212,7 +212,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils { } } long totalTime = System.currentTimeMillis() - beginTime; - if (totalTime > 3000){ + if (totalTime > 3000 && object != null){ logger.warn(object.getClass() + " unserialize time: " + TimeUtils.formatDateAgo(totalTime)); } return object; @@ -255,7 +255,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils { long beginTime = System.currentTimeMillis(); Object object = fstConfiguration.get().asObject(bytes); long totalTime = System.currentTimeMillis() - beginTime; - if (totalTime > 3000){ + if (totalTime > 3000 && object != null){ logger.warn(object.getClass() + " fst unserialize time: " + TimeUtils.formatDateAgo(totalTime)); } return object; diff --git a/common/src/main/java/com/jeesite/common/reflect/ClassUtils.java b/common/src/main/java/com/jeesite/common/reflect/ClassUtils.java index 3976f13f..883f4bec 100644 --- a/common/src/main/java/com/jeesite/common/reflect/ClassUtils.java +++ b/common/src/main/java/com/jeesite/common/reflect/ClassUtils.java @@ -288,7 +288,10 @@ abstract class VFS { // Try each implementation class until a valid one is found VFS vfs = null; - for (int i = 0; vfs == null || !vfs.isValid(); i++) { + for (int i = 0; true; i++) { + if (!(vfs == null || !vfs.isValid())) { + break; + } Class impl = impls.get(i); try { vfs = impl.getDeclaredConstructor().newInstance(); @@ -302,7 +305,7 @@ abstract class VFS { } } - log.debug("Using VFS adapter " + vfs.getClass().getName()); + log.debug("Using VFS adapter " + vfs == null ? null : vfs.getClass().getName()); return VFS.instance = vfs; }