From: Decebal Suiu <decebal.suiu@gmail.com>
Date: Tue, 13 Nov 2012 11:16:20 +0000 (+0200)
Subject: fix a bug related to plugin dependency
X-Git-Tag: release-0.3~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2293ed9a883bad70612772277973e95a5a5f3e5;p=pf4j.git

fix a bug related to plugin dependency
---

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginDescriptorFinder.java b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginDescriptorFinder.java
index 3cb6712..201ebb1 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginDescriptorFinder.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginDescriptorFinder.java
@@ -86,6 +86,6 @@ public class DefaultPluginDescriptorFinder implements PluginDescriptorFinder {
 	}
     
 	private boolean isEmpty(String value) {
-		return (value != null) && !value.isEmpty();
+		return (value == null) || value.isEmpty();
 	}
 }
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptor.java b/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptor.java
index aba2fac..e6006d2 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptor.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptor.java
@@ -13,7 +13,6 @@
 package ro.fortsoft.pf4j;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -107,10 +106,21 @@ public class PluginDescriptor {
     
     void setDependencies(String dependencies) {
     	if (dependencies != null) {
-    		this.dependencies = new ArrayList<PluginDependency>();
-    		List<String> tokens = Arrays.asList(dependencies.split(","));
-    		for (String dependency : tokens) {
-    			this.dependencies.add(new PluginDependency(dependency));
+    		dependencies = dependencies.trim();
+    		if (dependencies.isEmpty()) {
+    			this.dependencies = Collections.emptyList();
+    		} else {
+	    		this.dependencies = new ArrayList<PluginDependency>();
+	    		String[] tokens = dependencies.split(",");    		
+	    		for (String dependency : tokens) {
+	    			dependency = dependency.trim();
+	    			if (!dependency.isEmpty()) {
+	    				this.dependencies.add(new PluginDependency(dependency));
+	    			}
+	    		}
+	    		if (this.dependencies.isEmpty()) {
+	    			this.dependencies = Collections.emptyList();
+	    		}
     		}
     	} else {
     		this.dependencies = Collections.emptyList();