svn commit: r690156 - /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java

[fmeschbe]

Author: fmeschbe
Date: Fri Aug 29 02:21:02 2008
New Revision: 690156

URL: http://svn.apache.org/viewvc?rev=690156&view=rev
Log:
Ignore global property with "null" value (instead of throwing NPE)

Modified:
    
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java

Modified: 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java?rev=690156&r1=690155&r2=690156&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
 (original)
+++ 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
 Fri Aug 29 02:21:02 2008
@@ -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();