From 7278cd3e94082927009ed67f6c21cefd2aaaa9a3 Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 11 Sep 2017 21:22:14 +0800 Subject: [PATCH] bug fixed for weburi-profile. --- .../java/com/alibaba/druid/filter/stat/StatFilter.java | 8 +++++++- .../alibaba/druid/support/profile/ProfileEntryStat.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index 634f3b4313..a41ed39c0e 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -428,7 +428,13 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { StatFilterContext.getInstance().executeBefore(sql, inTransaction); - Profiler.enter(sql, Profiler.PROFILE_TYPE_SQL); + String mergedSql; + if (sqlStat != null) { + mergedSql = sqlStat.getSql(); + } else { + mergedSql = sql; + } + Profiler.enter(mergedSql, Profiler.PROFILE_TYPE_SQL); } private final void internalAfterStatementExecute(StatementProxy statement, boolean firstResult, diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java index ce36358752..b6f951edcd 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java @@ -36,7 +36,7 @@ public class ProfileEntryStat { ProfileEntryStatValue val = new ProfileEntryStatValue(); val.setExecuteCount(get(this, executeCountUpdater, reset)); - val.setExecuteTimeNanos(get(this, executeCountUpdater, reset)); + val.setExecuteTimeNanos(get(this, executeTimeNanosUpdater, reset)); return val; }