You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/11/01 08:22:55 UTC
svn commit: r1404484 -
/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationDelegate.java
Author: jbonofre
Date: Thu Nov 1 07:22:54 2012
New Revision: 1404484
URL: http://svn.apache.org/viewvc?rev=1404484&view=rev
Log:
[KARAF-1987] Fix NPE when org.osgi.framework.system.packages.extra is not define
Modified:
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationDelegate.java
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationDelegate.java?rev=1404484&r1=1404483&r2=1404484&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationDelegate.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationDelegate.java Thu Nov 1 07:22:54 2012
@@ -398,7 +398,7 @@ public class KarafLaunchConfigurationDel
* org.osgi.framework.system.packages.extra property
*/
final String extraSystemPackages = (String) equinoxProperties.get(OSGI_EXTRA_SYSTEM_PACKAGES_KEY);
- if (extraSystemPackages.trim().isEmpty()) {
+ if (extraSystemPackages != null && extraSystemPackages.trim().isEmpty()) {
equinoxProperties.remove(OSGI_EXTRA_SYSTEM_PACKAGES_KEY);
}