Skip to content

Commit 20c4ba4

Browse files
committed
AbstractDriverBasedDataSource does not rely on Properties chaining anymore
Issue: SPR-9461
1 parent be606f4 commit 20c4ba4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -139,7 +139,8 @@ public Connection getConnection(String username, String password) throws SQLExce
139139
* @see java.sql.Driver#connect(String, java.util.Properties)
140140
*/
141141
protected Connection getConnectionFromDriver(String username, String password) throws SQLException {
142-
Properties props = new Properties(getConnectionProperties());
142+
Properties props = new Properties();
143+
props.putAll(getConnectionProperties());
143144
if (username != null) {
144145
props.setProperty("user", username);
145146
}

0 commit comments

Comments
 (0)