Fix #116

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java b/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
index ede596a8b6b683eda1820b45f905fee58f42de3c..8332a1875bde297dcff6ae57461f09578e2c5e94 100644 (file)
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
@@ -50,12 +50,9 @@ public abstract class AbstractExtensionFinder implements ExtensionFinder, Plugin
         Map<String, Set<String>> entries = getEntries();
         List<ExtensionWrapper<T>> result = new ArrayList<>();
 
-        // add extensions found in classpath
-        List<ExtensionWrapper<T>> classpathExtensions = find(type, null);
-        result.addAll(classpathExtensions);
-
-        // add extensions found in each plugin
+        // add extensions found in classpath and plugins
         for (String pluginId : entries.keySet()) {
+            // classpath's extensions <=> pluginId = null
             List<ExtensionWrapper<T>> pluginExtensions = find(type, pluginId);
             result.addAll(pluginExtensions);
         }
@@ -78,6 +75,7 @@ public abstract class AbstractExtensionFinder implements ExtensionFinder, Plugin
         log.debug("Finding extensions of extension point '{}' for plugin '{}'", type.getName(), pluginId);
         List<ExtensionWrapper<T>> result = new ArrayList<>();
 
+        // classpath's extensions <=> pluginId = null
         Set<String> classNames = findClassNames(pluginId);
         if (classNames.isEmpty()) {
             return result;

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java b/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
index 44ddcb57cc6c7ebde814b75d6c66e921ea55dbee..eb8234f26cd0191f0b934312371dee066eb8c800 100644 (file)
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
@@ -32,6 +32,6 @@ import java.lang.annotation.Target;
 @Documented
 public @interface Extension {
 
-        int ordinal() default 0;
+       int ordinal() default 0;
 
 }