svn commit: r1680080 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java

[struberg]

Author: struberg
Date: Mon May 18 19:54:01 2015
New Revision: 1680080

URL: http://svn.apache.org/r1680080
Log:
only 'enhance' configProperties if one could have been found

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=1680080&r1=1680079&r2=1680080&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 May 18 19:54:01 2015
@@ -178,12 +178,13 @@ public class OpenWebBeansConfiguration
     {
         Properties newConfigProperties = 
PropertyLoader.getProperties(DEFAULT_CONFIG_PROPERTIES_NAME);
 
-        overrideWithGlobalSettings(newConfigProperties);
-
         configProperties.clear();
+
         // set the new one as perfect fit.
         if(newConfigProperties != null)
         {
+            overrideWithGlobalSettings(newConfigProperties);
+
             configProperties.putAll(newConfigProperties);
         }