修正Spring不能识别filters的问题

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@438 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-14 10:09:58 +00:00
parent 1b554be17d
commit 8f21688026
13 changed files with 44 additions and 46 deletions
@@ -287,7 +287,7 @@ public class FilterChainImpl implements FilterChain {
}
public List<Filter> getFilters() {
return dataSource.getFilters();
return dataSource.getProxyFilters();
}
@Override
@@ -653,7 +653,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
}
public static StatFilter getStatFilter(DataSourceProxy dataSource) {
for (Filter filter : dataSource.getFilters()) {
for (Filter filter : dataSource.getProxyFilters()) {
if (filter instanceof StatFilter) {
return (StatFilter) filter;
}
@@ -679,11 +679,11 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
}
@Override
public List<Filter> getFilters() {
public List<Filter> getProxyFilters() {
return filters;
}
public void setFilters(List<Filter> filters) {
public void setProxyFilters(List<Filter> filters) {
this.filters = filters;
}
@@ -902,7 +902,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
long startNano = System.nanoTime();
try {
if (dataSource.getFilters().size() != 0) {
if (dataSource.getProxyFilters().size() != 0) {
conn = new FilterChainImpl(dataSource).connection_connect(info);
} else {
conn = dataSource.getDriver().connect(url, info);
@@ -880,7 +880,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
public String[] getFilterClasses() {
List<Filter> filterConfigList = getFilters();
List<Filter> filterConfigList = getProxyFilters();
List<String> classes = new ArrayList<String>();
for (Filter filter : filterConfigList) {
@@ -893,7 +893,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public CompositeDataSupport getCompositeData() throws JMException {
StatFilter statFilter = null;
JdbcDataSourceStat stat = null;
for (Filter filter : this.getFilters()) {
for (Filter filter : this.getProxyFilters()) {
if (filter instanceof StatFilter) {
statFilter = (StatFilter) filter;
}
@@ -35,7 +35,7 @@ public interface DataSourceProxy {
String getRawJdbcUrl();
List<Filter> getFilters();
List<Filter> getProxyFilters();
long createConnectionId();
@@ -123,7 +123,7 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
return config.getUrl();
}
public List<Filter> getFilters() {
public List<Filter> getProxyFilters() {
return config.getFilters();
}
@@ -183,7 +183,7 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
public CompositeDataSupport getCompositeData() throws JMException {
StatFilter statFilter = null;
JdbcDataSourceStat stat = null;
for (Filter filter : this.getFilters()) {
for (Filter filter : this.getProxyFilters()) {
if (filter instanceof StatFilter) {
statFilter = (StatFilter) filter;
}
@@ -97,7 +97,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
}
public static StatFilter getStatFilter(DataSourceProxy dataSource) {
for (Filter filter : dataSource.getFilters()) {
for (Filter filter : dataSource.getProxyFilters()) {
if (filter instanceof StatFilter) {
return (StatFilter) filter;
}