commit e4f87e4d33baa25d7da5925a87f2117a2d20cecb
author Felix Meschberger <fmeschbe@apache.org> Fri Aug 29 09:21:02 2008 +0000
committer Felix Meschberger <fmeschbe@apache.org> Fri Aug 29 09:21:02 2008 +0000
tree 67d79d9d94eaf9337dd5afa5bd4726392ef9e09b
parent 7d3f0ed5fcf63b15e475fb46b27e4f57bbff779a

Ignore global property with "null" value (instead of throwing NPE)

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

scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java

diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
index bcd90f2..f7e5e6e 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
@@ -351,7 +351,7 @@
                 final String name = entry.getKey().toString();
 
                 // check if the service already provides this property
-                if ( !properties.containsKey(name) ) {
+                if ( !properties.containsKey(name) && entry.getValue() != null ) {
                     final String value = entry.getValue().toString();
 
                     final Property p = new Property();