From: Decebal Suiu <decebal.suiu@gmail.com>
Date: Fri, 29 Mar 2019 17:55:17 +0000 (+0200)
Subject: Resolve #292
X-Git-Tag: release-3.0.0~2^2~43
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6f2f72195943ae2bd5dfcdc7cd6e1a54235257f0;p=pf4j.git

Resolve #292
---

diff --git a/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
index c17fdab..ba12eef 100644
--- a/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
+++ b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
@@ -173,25 +173,19 @@ public abstract class AbstractPluginManager implements PluginManager {
     }
 
     @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
index 6bb6085..c2cbacc 100644
--- 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.