Merge pull request #253 from wenshao/master

bug fixed for stat

src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java

@@ -437,7 +437,7 @@ public abstract class FilterEventAdapter extends FilterAdapter {
         try {
             statementExecuteBefore(statement, statement.getSql());
 
-            boolean firstResult = super.preparedStatement_execute(chain, statement);
+            boolean firstResult = chain.preparedStatement_execute(statement);
 
             this.statementExecuteAfter(statement, statement.getSql(), firstResult);
 

src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java

@@ -673,8 +673,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
             }
         }
 
-        long millis = nanoSpan / (1000 * 1000);
-        histogramRecord(millis);
+        histogramRecord(nanoSpan);
     }
 
     public long getExecuteMillisTotal() {

src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java

@@ -21,6 +21,7 @@ public class ExceptionSorterTest extends TestCase {
         dataSource.setTestOnBorrow(true);
         dataSource.setDbType("mysql");
         dataSource.setPoolPreparedStatements(true);
+        dataSource.setFilters("stat");
 
         dataSource.init();
     }