commit 0290f49302063fc28f92ce48350064351fdd773e
author Guillaume Nodet <gnodet@apache.org> Tue Jun 17 11:25:40 2014 +0000
committer Guillaume Nodet <gnodet@apache.org> Tue Jun 17 11:25:40 2014 +0000
tree 07265c2f954a18dbfd5eb1818d6adaef8200e4e5
parent f1d0a1ced4d3cba7d8cbe98cee9a21eab08b2b00

[FELIX-4517] Fix possible exception

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1603131 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
index 23f3103..97b3d69 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
@@ -300,9 +300,13 @@
             else
             {
                 Set<String> merge = Create.set();
-                for (Clause clause : parseHeader(analyzer.getProperty(header)))
+                String org = analyzer.getProperty(header);
+                if (org != null && !org.isEmpty())
                 {
-                    merge.add(clause.toString());
+                    for (Clause clause : parseHeader(org))
+                    {
+                        merge.add(clause.toString());
+                    }
                 }
                 for (Clause clause : hdrs.get(header))
                 {