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

[rmannibucau]

Author: rmannibucau
Date: Wed Feb 20 15:46:01 2013
New Revision: 1448258

URL: http://svn.apache.org/r1448258
Log:
TOMEE-777 trying env var when looking for a placeholder if not found in system 
properties

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

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java?rev=1448258&r1=1448257&r2=1448258&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
 Wed Feb 20 15:46:01 2013
@@ -87,10 +87,11 @@ public final class PropertyPlaceHolderHe
 
     private static class PropertiesLookup extends StrLookup<Object> {
         private static final Properties PROPERTIES = 
SystemInstance.get().getProperties();
+        private static final Map<String, String> ENV = System.getenv();
 
         @Override
         public String lookup(final String key) {
-            return PROPERTIES.getProperty(key);
+            return PROPERTIES.getProperty(key, ENV.get(key));
         }
     }
 }