Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wenshao
2013-08-04 14:13:12 +08:00
parent 0c2ddd77e9 21f2d6ed91
commit 0fc9eb89bd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java
+1 -1
View File
@@ -213,7 +213,7 @@ public class ConfigFilter extends FilterAdapter {
}
public PublicKey getPublicKey(Properties connectinProperties, Properties configFileProperties) {
String key = connectinProperties.getProperty(CONFIG_KEY);
String key = configFileProperties.getProperty(CONFIG_KEY);
if (StringUtils.isEmpty(key) && connectinProperties != null) {
key = connectinProperties.getProperty(CONFIG_KEY);