From 4f107a1b16d2ad79a8093f3ff7ae9400b16d61bd Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Fri, 24 Aug 2012 15:06:01 +0800 Subject: [PATCH] fix character bom error --- src/main/java/com/alibaba/druid/proxy/DruidDriver.java | 2 +- .../com/alibaba/druid/stat/DruidStatManagerFacade.java | 7 +++++-- src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java | 2 +- .../java/com/alibaba/druid/util/ServletPathMatcher.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java index ed8e24fdd1..14e0fca618 100644 --- a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java +++ b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java @@ -144,7 +144,7 @@ public class DruidDriver implements Driver, DruidDriverMBean { } /** - * 参数定义ï¼?com.alibaba.druid.log.LogFilter=filter com.alibaba.druid.log.LogFilter.p1=prop-value + * 参数定义: com.alibaba.druid.log.LogFilter=filter com.alibaba.druid.log.LogFilter.p1=prop-value * com.alibaba.druid.log.LogFilter.p2=prop-value * * @param url diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java index f176cc98f8..0ced8fa0bd 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java @@ -33,9 +33,12 @@ import com.alibaba.druid.util.JdbcSqlStatUtils; import com.alibaba.druid.util.StringUtils; /** - * 监控相关的对外数据暴éœ? * + * 监控相关的对外数据暴露 + * *
- * 1. 为了支持jndi数据源本类内部调用druid相关对象均需要反射调ç”?返回值也应该是Object,List,Map等无关于druid的类åž? * 2. 对外暴露的public方法都应该先调用init(),应该有更好的方式,暂时没想åˆ? * 
+ * 1. 为了支持jndi数据源本类内部调用druid相关对象均需要反射调用,返回值也应该是Object,List,Map等无关于druid的类型
+ * 2. 对外暴露的public方法都应该先调用init(),应该有更好的方式,暂时没想到
+ * 
  * 
  * @author sandzhang
  */
diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
index 33c1a65028..5dcdfaf0aa 100644
--- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
+++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
@@ -394,7 +394,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
             long current = executeSpanNanoMax.get();
             if (current < nanoSpan) {
                 if (executeSpanNanoMax.compareAndSet(current, nanoSpan)) {
-                    // 可能不准确,但是绝大多数情况下都会正确,性能换取ä¸?‡´æ€?
+                	// 可能不准确,但是绝大多数情况下都会正确,性能换取一致性
                     executeNanoSpanMaxOccurTime = System.currentTimeMillis();
 
                     break;
diff --git a/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java b/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java
index 09c9f77200..11a5885dd6 100644
--- a/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java
+++ b/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java
@@ -19,7 +19,7 @@ public class ServletPathMatcher implements PatternMatcher {
 
     /**
      * 

- * three type: endsWithMatch(eg. /xxx*=/xxx/xyz), startsWithMatch(eg. *.xxx=abc.xxx), equals(eg. /xxx=/xxx)� + * three type: endsWithMatch(eg. /xxx*=/xxx/xyz), startsWithMatch(eg. *.xxx=abc.xxx), equals(eg. /xxx=/xxx). *

* Notice: *xxx* will match *xxxyyyy. endsWithMatch first. */