From c4bc25556538efbebde51d73b9c9115c74586007 Mon Sep 17 00:00:00 2001 From: MoonFruit Date: Mon, 21 Jun 2021 16:21:22 +0800 Subject: [PATCH 1/3] bug fix: JdbcSqlStat.addResultSetHoldTimeNano() should not convert to nanos --- src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index a0e7a261ed..35c8d24917 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -1057,7 +1057,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean, Comparable Date: Wed, 18 Aug 2021 19:45:29 +0800 Subject: [PATCH 2/3] Update StatViewServlet.java --- .../java/com/alibaba/druid/support/http/StatViewServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index fff7186679..7d3a88e7e8 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -152,7 +152,7 @@ public class StatViewServlet extends ResourceServlet { } /** - * 程序首先判断是否存在jmx连接地址,如果不存在,则直接调用本地的duird服务; 如果存在,则调用远程jmx服务。在进行jmx通信,首先判断一下jmx连接是否已经建立成功,如果已经 + * 程序首先判断是否存在jmx连接地址,如果不存在,则直接调用本地的druid服务; 如果存在,则调用远程jmx服务。在进行jmx通信,首先判断一下jmx连接是否已经建立成功,如果已经 * 建立成功,则直接进行通信,如果之前没有成功建立,则会尝试重新建立一遍。. * * @param url 要连接的服务地址 From 707586acb64b2b6c9a4d74ed9b1b7028a8d68b3f Mon Sep 17 00:00:00 2001 From: Chen Zhang <340355960@qq.com> Date: Wed, 18 Aug 2021 21:49:47 +0800 Subject: [PATCH 3/3] Improve Travis CI build Performance --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index ef2c288661..d4ecfc7776 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,3 +8,7 @@ after_success: branches: except: - appveyor + +cache: + directories: + - $HOME/.m2