svn commit: r1431710 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jan 10 22:34:04 2013
New Revision: 1431710

URL: http://svn.apache.org/viewvc?rev=1431710&view=rev
Log:
TOMEE-723 avoiding NPE in property placeholder

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java?rev=1431710&r1=1431709&r2=1431710&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
 Thu Jan 10 22:34:04 2013
@@ -16,9 +16,10 @@
  */
 package org.apache.openejb.util;
 
+import org.apache.openejb.loader.SystemInstance;
+
 import java.util.Map;
 import java.util.Properties;
-import org.apache.openejb.loader.SystemInstance;
 
 public final class PropertyPlaceHolderHelper {
     private static final String PREFIX = "${";
@@ -48,11 +49,16 @@ public final class PropertyPlaceHolderHe
     }
 
     public static Properties holds(final Properties properties) {
-        final Properties updated = new Properties();
+        // we can put null values in SuperProperties, since properties is 
often of this type we need to tolerate it
+        final Properties updated = new SuperProperties();
+        if (properties == null) {
+            return updated;
+        }
+
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
             final Object rawValue = entry.getValue();
             if (rawValue instanceof String) {
-                updated.put(entry.getKey(), value(rawValue.toString()));
+                updated.put(entry.getKey(), value((String) rawValue));
             } else {
                 updated.put(entry.getKey(), rawValue);
             }