From 9a87c66ba931110e9bbc9d56ba51647cd34f127f Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 5 Mar 2018 14:50:29 +0800 Subject: [PATCH] bug fixed for useGlobalDataSourceStat. --- .../com/alibaba/druid/pool/DruidDataSourceMBean.java | 2 ++ .../alibaba/druid/stat/DruidStatManagerFacade.java | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index 81d73513b5..5dcea2ee41 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -85,4 +85,6 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { int fill() throws SQLException; int fill(int toCount) throws SQLException; + + boolean isUseGlobalDataSourceStat(); } diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java index 67eb2ad8cd..f318e0b349 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java @@ -145,9 +145,21 @@ public final class DruidStatManagerFacade { Set dataSources = getDruidDataSourceInstances(); if (dataSourceId == null) { + JdbcDataSourceStat globalStat = JdbcDataSourceStat.getGlobal(); + List> sqlList = new ArrayList>(); + DruidDataSource globalStatDataSource = null; for (Object datasource : dataSources) { + if (datasource instanceof DruidDataSource) { + if (((DruidDataSource) datasource).getDataSourceStat() == globalStat) { + if (globalStatDataSource == null) { + globalStatDataSource = (DruidDataSource) datasource; + } else { + continue; + } + } + } sqlList.addAll(getSqlStatDataList(datasource)); }