Resolve #292

pf4j · Mar 29, 2019 · 6f2f721 · 6f2f721
1 parent b808c2d
commit 6f2f721
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
@@ -173,25 +173,19 @@ public PluginWrapper getPlugin(String pluginId) {
     }
 
     @Override
-    public String loadPlugin(Path pluginPath) {
+    public String loadPlugin(Path pluginPath) throws PluginException {
         if ((pluginPath == null) || Files.notExists(pluginPath)) {
             throw new IllegalArgumentException(String.format("Specified plugin %s does not exist!", pluginPath));
         }
 
         log.debug("Loading plugin from '{}'", pluginPath);
 
-        try {
-            PluginWrapper pluginWrapper = loadPluginFromPath(pluginPath);
+        PluginWrapper pluginWrapper = loadPluginFromPath(pluginPath);
 
-            // try to resolve  the loaded plugin together with other possible plugins that depend on this plugin
-            resolvePlugins();
+        // try to resolve  the loaded plugin together with other possible plugins that depend on this plugin
+        resolvePlugins();
 
-            return pluginWrapper.getDescriptor().getPluginId();
-        } catch (PluginException e) {
-            log.error(e.getMessage(), e);
-        }
-
-        return null;
+        return pluginWrapper.getDescriptor().getPluginId();
     }
 
     /**

diff --git a/pf4j/src/main/java/org/pf4j/PluginManager.java b/pf4j/src/main/java/org/pf4j/PluginManager.java
@@ -70,9 +70,10 @@ public interface PluginManager {
      *
      * @param pluginPath the plugin location
      * @return the pluginId of the installed plugin as specified in
-     *     its {@linkplain PluginDescriptor metadata}; or {@code null}
+     *     its {@linkplain PluginDescriptor metadata}
+     *  @throws PluginException if load of plugin fails
      */
-    String loadPlugin(Path pluginPath);
+    String loadPlugin(Path pluginPath) throws PluginException;
 
     /**
      * Start all active plugins.