felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r1350991 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
Date Sat, 16 Jun 2012 20:00:04 GMT
Author: rickhall
Date: Sat Jun 16 20:00:03 2012
New Revision: 1350991

URL: http://svn.apache.org/viewvc?rev=1350991&view=rev
Log:
Ignore ".extra" properties with an empty string. (FELIX-3372)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java?rev=1350991&r1=1350990&r2=1350991&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java Sat
Jun 16 20:00:03 2012
@@ -193,7 +193,8 @@ class ExtensionManager extends URLStream
         // 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 @@ class ExtensionManager extends URLStream
         // 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
         {



Mime
View raw message