From cec2ed6d25f9b3f70b90ee3c8af70149992dbbce Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 2 Aug 2014 23:56:39 +0800 Subject: [PATCH] bug fixed for merged code --- .../java/com/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- .../java/com/alibaba/druid/pool/DruidDataSourceStatValue.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index d746716083..4f14805dff 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -200,7 +200,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements protected final AtomicLong cachedPreparedStatementDeleteCount = new AtomicLong(); protected final AtomicLong cachedPreparedStatementMissCount = new AtomicLong(); - protected final Histogram transactionHistogram = new Histogram( + protected final Histogram transactionHistogram = new Histogram(1, 10, 100, 1000, diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java index 1fc1b46dfb..9fc1de7285 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java @@ -515,7 +515,7 @@ public class DruidDataSourceStatValue { public void setTransactionHistogram(long[] values) { txn_0_1 = values[0]; - txn_1_10 = values[1] + txn_1_10 = values[1]; txn_10_100 = values[2]; txn_100_1000 = values[3]; txn_1000_10000 = values[4];