You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sirona.apache.org by ol...@apache.org on 2013/11/11 07:33:17 UTC

svn commit: r1540616 - /incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java

Author: olamy
Date: Mon Nov 11 06:33:16 2013
New Revision: 1540616

URL: http://svn.apache.org/r1540616
Log:
reverse properties order loading System props win/override

Modified:
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java

Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java?rev=1540616&r1=1540615&r2=1540616&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java Mon Nov 11 06:33:16 2013
@@ -52,7 +52,7 @@ public final class Configuration {
 
     private static Thread shutdownHook = null;
 
-    private static final Properties PROPERTIES = new Properties(System.getProperties());
+    private static final Properties PROPERTIES = new Properties();
 
     static {
         try {
@@ -60,6 +60,7 @@ public final class Configuration {
             if (is != null) {
                 PROPERTIES.load(is);
             }
+            PROPERTIES.putAll( System.getProperties() );
         } catch (final Exception e) {
             LOGGER.log(Level.SEVERE, e.getMessage(), e);
         }