Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 17:56:17 +01:00
Code Issues Packages Projects Releases Activity

Fix plugin installation error if previously a plugin was installed with the same dependency which is still pending.

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-08-25 12:41:07 +02:00
parent 61be5b154c
commit a36c0e2a16
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -86,7 +86,11 @@ public class DefaultPluginManager implements PluginManager {
if (contextFactory != null) {
this.contextFactory = contextFactory;
} else {
this.contextFactory = (availablePlugins -> PluginInstallationContext.from(getInstalled(), availablePlugins));
this.contextFactory = (plugins -> {
List<AvailablePlugin> pendingPlugins = new ArrayList<>(plugins);
pendingInstallQueue.stream().map(PendingPluginInstallation::getPlugin).forEach(pendingPlugins::add);
return PluginInstallationContext.from(getInstalled(), pendingPlugins);
});
}
this.computeInstallationDependencies();