felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1603131 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
Date Tue, 17 Jun 2014 11:25:41 GMT
Author: gnodet
Date: Tue Jun 17 11:25:40 2014
New Revision: 1603131

URL: http://svn.apache.org/r1603131
Log:
[FELIX-4517] Fix possible exception

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java?rev=1603131&r1=1603130&r2=1603131&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
(original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
Tue Jun 17 11:25:40 2014
@@ -300,9 +300,13 @@ public class BlueprintPlugin implements 
             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))
                 {



Mime
View raw message