Browse Source

Unload broken plugins fix (#545)

pull/551/head
finn0s 1 year ago committed by GitHub
parent
commit
4715257de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
  2. 30
      pf4j/src/test/java/org/pf4j/JarPluginManagerTest.java

13
pf4j/src/main/java/org/pf4j/AbstractPluginManager.java

@ -280,14 +280,21 @@ public abstract class AbstractPluginManager implements PluginManager {
dependents.addAll(0, dependencyResolver.getDependents(dependent)); dependents.addAll(0, dependencyResolver.getDependents(dependent));
} }
} }
PluginWrapper pluginWrapper = getPlugin(pluginId);
PluginState pluginState = stopPlugin(pluginId, false); PluginState pluginState;
try {
pluginState = stopPlugin(pluginId, false);
if (PluginState.STARTED == pluginState) { if (PluginState.STARTED == pluginState) {
return false; return false;
} }
PluginWrapper pluginWrapper = getPlugin(pluginId);
log.info("Unload plugin '{}'", getPluginLabel(pluginWrapper.getDescriptor())); log.info("Unload plugin '{}'", getPluginLabel(pluginWrapper.getDescriptor()));
} catch (Exception e) {
if (pluginWrapper == null) {
return false;
}
pluginState = PluginState.FAILED;
}
// remove the plugin // remove the plugin
plugins.remove(pluginId); plugins.remove(pluginId);

30
pf4j/src/test/java/org/pf4j/JarPluginManagerTest.java

@ -16,8 +16,11 @@
package org.pf4j; package org.pf4j;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.io.TempDir;
import org.pf4j.test.PluginJar; import org.pf4j.test.PluginJar;
import org.pf4j.test.TestExtension; import org.pf4j.test.TestExtension;
@ -25,8 +28,11 @@ import org.pf4j.test.TestExtensionPoint;
import org.pf4j.test.TestPlugin; import org.pf4j.test.TestPlugin;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileSystemException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
@ -95,4 +101,28 @@ public class JarPluginManagerTest {
assertFalse(pluginJar.file().exists()); assertFalse(pluginJar.file().exists());
} }
@Test
@EnabledOnOs(OS.WINDOWS)
public void releaseBrokenJarOnWindows() throws IOException {
PluginJar pluginZip = new PluginJar.Builder(pluginsPath.resolve("test.jar"), "test")
.pluginVersion("1.2.3")
.pluginClass("invalidClass")
.build();
pluginManager.loadPlugins();
Path pluginPath = pluginManager.getPlugin(pluginZip.pluginId()).getPluginPath();
try {
pluginManager.startPlugin(pluginZip.pluginId());
} catch (Exception exceptionStartPlugin) {
Assertions.assertThrows(FileSystemException.class, () -> Files.delete(pluginPath));
// Try to remove the plugin if it cannot be started
try {
pluginManager.unloadPlugin(pluginZip.pluginId());
} catch (Exception ignored2) {
}
Assertions.assertDoesNotThrow(() -> Files.delete(pluginPath));
}
}
} }

Loading…
Cancel
Save