|
|
@ -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); |
|
|
|
} |
|
|
|
} |
|
|
|