Catch throwables when loading plugins (#1098)

This commit is contained in:
Joo200
2023-10-11 17:24:35 +02:00
committed by GitHub
parent 2bd2c692ea
commit 9be0bca3c4

View File

@@ -94,7 +94,7 @@ public class VelocityPluginManager implements PluginManager {
for (Path path : stream) { for (Path path : stream) {
try { try {
found.add(loader.loadCandidate(path)); found.add(loader.loadCandidate(path));
} catch (Exception e) { } catch (Throwable e) {
logger.error("Unable to load plugin {}", path, e); logger.error("Unable to load plugin {}", path, e);
} }
} }
@@ -126,7 +126,7 @@ public class VelocityPluginManager implements PluginManager {
VelocityPluginContainer container = new VelocityPluginContainer(realPlugin); VelocityPluginContainer container = new VelocityPluginContainer(realPlugin);
pluginContainers.put(container, loader.createModule(container)); pluginContainers.put(container, loader.createModule(container));
loadedPluginsById.add(realPlugin.getId()); loadedPluginsById.add(realPlugin.getId());
} catch (Exception e) { } catch (Throwable e) {
logger.error("Can't create module for plugin {}", candidate.getId(), e); logger.error("Can't create module for plugin {}", candidate.getId(), e);
} }
} }
@@ -153,7 +153,7 @@ public class VelocityPluginManager implements PluginManager {
try { try {
loader.createPlugin(container, plugin.getValue(), commonModule); loader.createPlugin(container, plugin.getValue(), commonModule);
} catch (Exception e) { } catch (Throwable e) {
logger.error("Can't create plugin {}", description.getId(), e); logger.error("Can't create plugin {}", description.getId(), e);
continue; continue;
} }