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

Execute restart, when there are only plugins to uninstall

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-09-18 08:35:59 +02:00
parent 780fc2140f
commit f53f6f0a25
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,7 +222,7 @@ public class DefaultPluginManager implements PluginManager {
@Override @Override
public void executePendingAndRestart() { public void executePendingAndRestart() {
PluginPermissions.manage().check(); PluginPermissions.manage().check();
if (!pendingQueue.isEmpty()) { if (!pendingQueue.isEmpty() || getInstalled().stream().anyMatch(InstalledPlugin::isMarkedForUninstall)) {
restart("execute pending plugin changes"); restart("execute pending plugin changes");
} }
} }

12
scm-webapp/src/test/java/sonia/scm/plugin/DefaultPluginManagerTest.java
View File

@@ -415,6 +415,18 @@ class DefaultPluginManagerTest {
verify(mailPlugin).setUninstallable(false); verify(mailPlugin).setUninstallable(false);
} }
@Test
void shouldRestartWithUninstallOnly() {
InstalledPlugin mailPlugin = createInstalled("scm-mail-plugin");
when(mailPlugin.isMarkedForUninstall()).thenReturn(true);
when(loader.getInstalledPlugins()).thenReturn(singletonList(mailPlugin));
manager.executePendingAndRestart();
verify(eventBus).post(any(RestartEvent.class));
}
} }
@Nested @Nested