[MMBASE SCM] r41755 - in mmbase: branches/MMBase-1_9/core/src/main/java/org/mmbase/util trunk/utils/src/main/java/org/mmbase/util

[nico]

Author: nico
Date: 2010-04-03 16:39:36 +0200 (Sat, 03 Apr 2010)
New Revision: 41755

Modified:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ApplicationContextReader.java
   
mmbase/trunk/utils/src/main/java/org/mmbase/util/ApplicationContextReader.java
Log:
Store null value as empty string

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ApplicationContextReader.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ApplicationContextReader.java
 2010-04-03 14:38:43 UTC (rev 41754)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/ApplicationContextReader.java
 2010-04-03 14:39:36 UTC (rev 41755)
@@ -79,7 +79,12 @@
                         properties.put(contextName + "/" + entry.getKey(), 
entry.getValue());
                     }
                 } else {
-                    properties.put(contextName, value.toString());
+                   if (value != null) {
+                      properties.put(contextName, value.toString());
+                   }
+                   else {
+                      properties.put(contextName, "");
+                   }
                 }
             }
         }

Modified: 
mmbase/trunk/utils/src/main/java/org/mmbase/util/ApplicationContextReader.java
===================================================================
--- 
mmbase/trunk/utils/src/main/java/org/mmbase/util/ApplicationContextReader.java  
    2010-04-03 14:38:43 UTC (rev 41754)
+++ 
mmbase/trunk/utils/src/main/java/org/mmbase/util/ApplicationContextReader.java  
    2010-04-03 14:39:36 UTC (rev 41755)
@@ -79,7 +79,12 @@
                         properties.put(contextName + "/" + entry.getKey(), 
entry.getValue());
                     }
                 } else {
-                    properties.put(contextName, value.toString());
+                   if (value != null) {
+                      properties.put(contextName, value.toString());
+                   }
+                   else {
+                      properties.put(contextName, "");
+                   }
                 }
             }
         }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs