openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1837062 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Date Mon, 30 Jul 2018 14:13:34 GMT
Author: rmannibucau
Date: Mon Jul 30 14:13:34 2018
New Revision: 1837062

URL: http://svn.apache.org/viewvc?rev=1837062&view=rev
Log:
OWB-1249 ensure environment variables don't hit a dot for OpenWebBeansConfiguration overrides

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1837062&r1=1837061&r2=1837062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Mon Jul 30 14:13:34 2018
@@ -329,9 +329,14 @@ public class OpenWebBeansConfiguration
             String value = (String) property.getValue();
 
             value = systemProperties.getProperty(key) != null ? systemProperties.getProperty(key)
: value;
-            value = systemEnvironment.get(key) != null ? systemEnvironment.get(key) : value;
 
-            configProperties.put(key, value);
+            String envKey = key.replace('.', '_');
+            value = systemEnvironment.get(envKey) != null ? systemEnvironment.get(envKey)
: value;
+
+            if (value != null)
+            {
+                configProperties.put(key, value);
+            }
         }
     }
 



Mime
View raw message