aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDecebal Suiu <decebal.suiu@gmail.com>2018-05-16 19:27:44 +0300
committerDecebal Suiu <decebal.suiu@gmail.com>2018-05-16 19:27:44 +0300
commitad25a4a99c777b438defc08ef9d7cfb48dd63b40 (patch)
tree387ee1aaa4c6db431c8a698db7f156a758eba66f
parentf80bc959c133ea10edb38510e0f3a4580b9358ac (diff)
downloadpf4j-ad25a4a99c777b438defc08ef9d7cfb48dd63b40.tar.gz
pf4j-ad25a4a99c777b438defc08ef9d7cfb48dd63b40.zip
Resolve #218
-rw-r--r--pf4j/src/main/java/org/pf4j/AbstractPluginManager.java3
-rw-r--r--pf4j/src/main/java/org/pf4j/PluginAlreadyLoadedException.java43
-rw-r--r--pf4j/src/main/java/org/pf4j/PluginException.java3
3 files changed, 46 insertions, 3 deletions
diff --git a/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
index 2a3e27a..4336df9 100644
--- a/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
+++ b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
@@ -807,8 +807,7 @@ public abstract class AbstractPluginManager implements PluginManager {
// test for plugin duplication
String pluginId = idForPath(pluginPath);
if (pluginId != null) {
- log.warn("Plugin '{}' already loaded with id '{}'", pluginPath, pluginId);
- return null;
+ throw new PluginAlreadyLoadedException(pluginId, pluginPath);
}
// retrieves the plugin descriptor
diff --git a/pf4j/src/main/java/org/pf4j/PluginAlreadyLoadedException.java b/pf4j/src/main/java/org/pf4j/PluginAlreadyLoadedException.java
new file mode 100644
index 0000000..adfd90b
--- /dev/null
+++ b/pf4j/src/main/java/org/pf4j/PluginAlreadyLoadedException.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pf4j;
+
+import java.nio.file.Path;
+
+/**
+ * @author Decebal Suiu
+ */
+public class PluginAlreadyLoadedException extends PluginException {
+
+ private final String pluginId;
+ private final Path pluginPath;
+
+ public PluginAlreadyLoadedException(String pluginId, Path pluginPath) {
+ super("Plugin '{}' already loaded with id '{}'", pluginPath, pluginId);
+
+ this.pluginId = pluginId;
+ this.pluginPath = pluginPath;
+ }
+
+ public String getPluginId() {
+ return pluginId;
+ }
+
+ public Path getPluginPath() {
+ return pluginPath;
+ }
+
+}
diff --git a/pf4j/src/main/java/org/pf4j/PluginException.java b/pf4j/src/main/java/org/pf4j/PluginException.java
index 0d1e8e2..d1ba6f2 100644
--- a/pf4j/src/main/java/org/pf4j/PluginException.java
+++ b/pf4j/src/main/java/org/pf4j/PluginException.java
@@ -19,12 +19,13 @@ import org.pf4j.util.StringUtils;
/**
* An exception used to indicate that a plugin problem occurred.
+ * It's a generic plugin exception class to be thrown when no more specific class is applicable.
*
* @author Decebal Suiu
*/
public class PluginException extends Exception {
- public PluginException() {
+ public PluginException() {
super();
}