diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java index 37d74f4f8..916494669 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java @@ -81,7 +81,14 @@ public class SimpleDriverDataSource } protected Connection getSimpleConnection(Properties props) throws SQLException { - Connection con = getSimpleDriver().connect(_connectionURL, props == null? new Properties() : props); + Properties conProps = new Properties(); + if (props != null) { + conProps.putAll(props); + } + if (_connectionProperties != null) { + conProps.putAll(_connectionProperties); + } + Connection con = getSimpleDriver().connect(_connectionURL, conProps); if (con == null) { throw new SQLException(_eloc.get("poolds-null", _connectionDriverName, _connectionURL).getMessage());