From e996639f4709bcdf9b4bfcdb72fd086ce61cfcdb Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 10 Apr 2014 15:29:02 -0400 Subject: [PATCH] Allow disabled plugins to be unloaded and deleted --- .../java/ro/fortsoft/pf4j/DefaultPluginManager.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java index 47dce71..c44787e 100644 --- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java +++ b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java @@ -12,15 +12,16 @@ */ package ro.fortsoft.pf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import ro.fortsoft.pf4j.util.*; - import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.util.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ro.fortsoft.pf4j.util.*; + /** * Default implementation of the PluginManager interface. * @@ -372,7 +373,7 @@ public class DefaultPluginManager implements PluginManager { public boolean unloadPlugin(String pluginId) { try { PluginState pluginState = stopPlugin(pluginId); - if (PluginState.STOPPED != pluginState) { + if (PluginState.STARTED == pluginState) { return false; } @@ -486,7 +487,7 @@ public class DefaultPluginManager implements PluginManager { PluginWrapper pluginWrapper = getPlugin(pluginId); PluginState pluginState = stopPlugin(pluginId); - if (PluginState.STOPPED != pluginState) { + if (PluginState.STARTED == pluginState) { log.error("Failed to stop plugin {} on delete", pluginId); return false; } -- 2.39.5