From bdba952244bd57fb3fbf978eccd60d00c9d7e8c1 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 21 Dec 2011 09:43:14 +0800 Subject: [PATCH] ha --- src/main/java/com/alibaba/druid/pool/ha/HADataSource.java | 4 ++-- src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java b/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java index 450a5f4c9b..391cb5bd54 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java @@ -50,7 +50,7 @@ public class HADataSource extends MultiDataSource implements HADataSourceMBean, } public void setMaster(DataSourceHolder master) { - this.getDataSources().put("master", master); + this.addDataSource("master", master); this.master = master; } @@ -63,7 +63,7 @@ public class HADataSource extends MultiDataSource implements HADataSourceMBean, } public void setSlave(DataSourceHolder slave) { - this.getDataSources().put("slave", slave); + this.addDataSource("slave", slave); this.slave = slave; } diff --git a/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java index 425495e970..79bea24c32 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java @@ -258,7 +258,7 @@ public abstract class MultiDataSource extends DataSourceAdapter implements Multi public void addDataSource(String name, DataSourceHolder dataSourceHolder) { dataSources.put(name, dataSourceHolder); - this.totalWeight += dataSourceHolder.getWeight(); + this.computeTotalWeight(); } public Properties getProperties() {