root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

AbstractDriverBasedDataSource does not rely on Properties chaining anymore 

Issue: SPR-9461
This commit is contained in:
Juergen Hoeller 2013-01-18 14:02:13 +01:00
parent be606f4169
commit 20c4ba40d8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -139,7 +139,8 @@ public abstract class AbstractDriverBasedDataSource extends AbstractDataSource {
* @see java.sql.Driver#connect(String, java.util.Properties) * @see java.sql.Driver#connect(String, java.util.Properties)
*/ */
protected Connection getConnectionFromDriver(String username, String password) throws SQLException { protected Connection getConnectionFromDriver(String username, String password) throws SQLException {
Properties props = new Properties(getConnectionProperties()); Properties props = new Properties();
props.putAll(getConnectionProperties());
if (username != null) { if (username != null) {
props.setProperty("user", username); props.setProperty("user", username);
} }