0001222: db. properties are not overridable as -D system properties

JumpMind · Jun 1, 2013 · fa1da09 · fa1da09
1 parent 3ba55c3
commit fa1da09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/util/BasicDataSourceFactory.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/util/BasicDataSourceFactory.java
@@ -43,6 +43,8 @@ public static BasicDataSource create(TypedProperties properties) {
 
     public static BasicDataSource create(TypedProperties properties,
             ISecurityService securityService) {
+        properties = properties.copy();
+        properties.putAll(System.getProperties());
         ResettableBasicDataSource dataSource = new ResettableBasicDataSource();
         dataSource.setDriverClassName(properties.get(
                 BasicDataSourcePropertyConstants.DB_POOL_DRIVER, null));

diff --git a/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java b/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java
@@ -182,5 +182,9 @@ public void merge(Properties properties) {
             }
         }
     }
+
+    public TypedProperties copy() {
+        return new TypedProperties(this);
+    }
 
 }