ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: Don't crash when outdated plugins are trying to load

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-18 15:20:54 +02:00
parent ca4e84114e
commit bf7b4e2a8f
1 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
View File

@@ -503,6 +503,12 @@ public class ExternalPluginManager
{ {
//noinspection unchecked //noinspection unchecked
plugininst = instantiate(scannedPlugins, (Class<Plugin>) pluginClazz, init, initConfig); plugininst = instantiate(scannedPlugins, (Class<Plugin>) pluginClazz, init, initConfig);
if (plugininst == null)
{
return;
}
scannedPlugins.add(plugininst); scannedPlugins.add(plugininst);
} }
catch (PluginInstantiationException e) catch (PluginInstantiationException e)
@@ -654,6 +660,11 @@ public class ExternalPluginManager
{ {
throw new PluginInstantiationException(ex); throw new PluginInstantiationException(ex);
} }
catch (NoClassDefFoundError ex)
{
log.error("Plugin {} is outdated", clazz.getSimpleName());
return null;
}
log.debug("Loaded plugin {}", clazz.getSimpleName()); log.debug("Loaded plugin {}", clazz.getSimpleName());
return plugin; return plugin;
@@ -712,39 +723,46 @@ public class ExternalPluginManager
private List<Plugin> loadPlugin(String pluginId) private List<Plugin> loadPlugin(String pluginId)
{ {
List<Plugin> scannedPlugins = new ArrayList<>(); List<Plugin> scannedPlugins = new ArrayList<>();
List<Plugin> extensions = externalPluginManager.getExtensions(Plugin.class, pluginId); try
for (Plugin plugin : extensions)
{ {
pluginClassLoaders.add(plugin.getClass().getClassLoader()); List<Plugin> extensions = externalPluginManager.getExtensions(Plugin.class, pluginId);
for (Plugin plugin : extensions)
{
pluginClassLoaders.add(plugin.getClass().getClassLoader());
pluginsMap.remove(plugin.getClass().getSimpleName()); pluginsMap.remove(plugin.getClass().getSimpleName());
pluginsMap.put(plugin.getClass().getSimpleName(), pluginId); pluginsMap.put(plugin.getClass().getSimpleName(), pluginId);
pluginsInfoMap.remove(plugin.getClass().getSimpleName()); pluginsInfoMap.remove(plugin.getClass().getSimpleName());
AtomicReference<String> support = new AtomicReference<>(""); AtomicReference<String> support = new AtomicReference<>("");
updateManager.getRepositories().forEach(repository -> updateManager.getRepositories().forEach(repository ->
repository.getPlugins().forEach((key, value) -> repository.getPlugins().forEach((key, value) ->
{
if (key.equals(pluginId))
{ {
support.set(value.projectUrl); if (key.equals(pluginId))
} {
})); support.set(value.projectUrl);
}
}));
pluginsInfoMap.put( pluginsInfoMap.put(
plugin.getClass().getSimpleName(), plugin.getClass().getSimpleName(),
new HashMap<>() new HashMap<>()
{{ {{
put("version", externalPluginManager.getPlugin(pluginId).getDescriptor().getVersion()); put("version", externalPluginManager.getPlugin(pluginId).getDescriptor().getVersion());
put("id", externalPluginManager.getPlugin(pluginId).getDescriptor().getPluginId()); put("id", externalPluginManager.getPlugin(pluginId).getDescriptor().getPluginId());
put("provider", externalPluginManager.getPlugin(pluginId).getDescriptor().getProvider()); put("provider", externalPluginManager.getPlugin(pluginId).getDescriptor().getProvider());
put("support", support.get()); put("support", support.get());
}} }}
); );
scannedPlugins.add(plugin); scannedPlugins.add(plugin);
}
}
catch (NoClassDefFoundError ex)
{
log.error("plugin {} is outdated", pluginId);
} }
return scannedPlugins; return scannedPlugins;