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 branch 'master' of https://github.com/AlibabaTech/druid

Browse Source 
Conflicts:
	src/main/java/com/alibaba/druid/pool/DruidDataSource.java
	src/main/java/com/alibaba/druid/pool/ha/DataSourceHolder.java
This commit is contained in:
wenshao
2011-12-20 22:46:19 +08:00
parent 03b41811ea 87ab582fdb
commit 41cc5cd57b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java
+3 -2
View File
@@ -228,6 +228,7 @@ public abstract class MultiDataSource extends DataSourceAdapter implements Multi
public String[] getDataSourceNames() {
return this.dataSources.keySet().toArray(new String[this.dataSources.size()]);
}
@Override
public String getDbType() {
@@ -263,14 +264,14 @@ public abstract class MultiDataSource extends DataSourceAdapter implements Multi
public long createTransactionId() {
return transactionIdSeed.incrementAndGet();
}
public boolean restartDataSource(String name) {
DataSourceHolder holder = this.getDataSources().get(name);
if (holder != null) {
holder.restart();
return true;
}
return false;
}