refactor(script): 调整了加载脚本时获取 ScriptInfo 时异常捕获的时机.

调整后, 当获取 ScriptInfo 抛出异常时, 会作为脚本加载失败处理.
This commit is contained in:
LamGC 2021-10-10 19:46:20 +08:00
parent e6ff28e077
commit 43a8ac4026
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D

View File

@ -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;
}