commit a0407786dd74811a4d580f37e5ba313abdb03ac1
author Richard S. Hall <rickhall@apache.org> Sat Jun 16 20:00:03 2012 +0000
committer Richard S. Hall <rickhall@apache.org> Sat Jun 16 20:00:03 2012 +0000
tree ae2f2ee7f6f74f43635cce4d7fe4a77350482ef2
parent 6cf675983205871ad31b97dca799260c72ab122a

Ignore ".extra" properties with an empty string. (FELIX-3372)


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

framework/src/main/java/org/apache/felix/framework/ExtensionManager.java

diff --git a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
index ff328b2..2bc580b 100644
--- a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
+++ b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
@@ -193,7 +193,8 @@
         // If any extra packages are specified, then append them.
         String pkgextra =
             (String) m_configMap.get(FelixConstants.FRAMEWORK_SYSTEMPACKAGES_EXTRA);
-        syspkgs = (pkgextra == null) ? syspkgs : syspkgs + "," + pkgextra;
+        syspkgs = ((pkgextra == null) || (pkgextra.trim().length() == 0))
+            ? syspkgs : syspkgs + "," + pkgextra;
         m_headerMap.put(FelixConstants.BUNDLE_MANIFESTVERSION, "2");
         m_headerMap.put(FelixConstants.EXPORT_PACKAGE, syspkgs);
 
@@ -212,7 +213,8 @@
         // If any extra capabilities are specified, then append them.
         String capextra =
             (String) m_configMap.get(FelixConstants.FRAMEWORK_SYSTEMCAPABILITIES_EXTRA);
-        syscaps = (capextra == null) ? syscaps : syscaps + "," + capextra;
+        syscaps = ((capextra == null) || (capextra.trim().length() == 0))
+            ? syscaps : syscaps + "," + capextra;
         m_headerMap.put(FelixConstants.PROVIDE_CAPABILITY, syscaps);
         try
         {