From 43a8ac4026168925790ce3737e342cad00ac9d77 Mon Sep 17 00:00:00 2001 From: LamGC Date: Sun, 10 Oct 2021 19:46:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor(script):=20=E8=B0=83=E6=95=B4=E4=BA=86?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=84=9A=E6=9C=AC=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=20ScriptInfo=20=E6=97=B6=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E6=9C=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整后, 当获取 ScriptInfo 抛出异常时, 会作为脚本加载失败处理. --- .../lamgc/oracle/sentry/script/ScriptManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/lamgc/oracle/sentry/script/ScriptManager.java b/src/main/java/net/lamgc/oracle/sentry/script/ScriptManager.java index c6fad75..db62850 100644 --- a/src/main/java/net/lamgc/oracle/sentry/script/ScriptManager.java +++ b/src/main/java/net/lamgc/oracle/sentry/script/ScriptManager.java @@ -66,6 +66,13 @@ public final class ScriptManager { } else { continue; } + ScriptInfo scriptInfo = loader.getScriptInfo(script); + if (scriptInfo == null) { + log.warn("脚本加载成功, 但加载器没有返回脚本信息, 该脚本已放弃."); + return false; + } + scripts.put(scriptInfo, script); + return true; } catch (Exception e) { log.error("脚本加载时发生异常.(Loader: {}, Path: {})\n{}", loader.getClass().getName(), @@ -73,13 +80,6 @@ public final class ScriptManager { Throwables.getStackTraceAsString(e)); throw new InvocationTargetException(e); } - ScriptInfo scriptInfo = loader.getScriptInfo(script); - if (scriptInfo == null) { - log.warn("脚本加载成功, 但加载器没有返回脚本信息, 该脚本已放弃."); - return false; - } - scripts.put(scriptInfo, script); - return true; } return false; }