From 87ab420018c037fb505809cd036f6d209c010671 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 28 Aug 2012 12:03:07 +0800 Subject: [PATCH] add testcase & remove unused code --- .../druid/pool/DruidAbstractDataSource.java | 27 +++++-------------- .../bvt/pool/DruidDataSourceTest_oracle2.java | 8 ++++++ 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 415cc131f2..2ae8f09340 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -1356,22 +1356,15 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements map.put("StatementExecuteCount", stat.getStatementStat().getExecuteCount()); map.put("StatementRunningCount", stat.getStatementStat().getRunningCount()); - // 15 -24 + // 15 - 19 map.put("StatementConcurrentMax", stat.getStatementStat().getConcurrentMax()); map.put("StatementCloseCount", stat.getStatementStat().getCloseCount()); map.put("StatementErrorCount", stat.getStatementStat().getErrorCount()); - Throwable lastStatementError = stat.getStatementStat().getLastException(); - if (lastStatementError != null) { - map.put("StatementLastErrorTime", stat.getStatementStat().getLastErrorTime()); - map.put("StatementLastErrorMessage", lastStatementError.getMessage()); + map.put("StatementLastErrorTime", null); + map.put("StatementLastErrorMessage", null); - map.put("StatementLastErrorStackTrace", IOUtils.getStackTrace(lastStatementError)); - } else { - map.put("StatementLastErrorTime", null); - map.put("StatementLastErrorMessage", null); - - map.put("StatementLastErrorStackTrace", null); - } + // 20 - 24 + map.put("StatementLastErrorStackTrace", null); map.put("StatementExecuteMillisTotal", stat.getStatementStat().getMillisTotal()); map.put("StatementExecuteLastTime", stat.getStatementStat().getExecuteLastTime()); map.put("ConnectionConnectingCount", stat.getConnectionStat().getConnectingCount()); @@ -1388,14 +1381,8 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements map.put("ResultSetErrorCount", stat.getResultSetStat().getErrorCount()); map.put("ResultSetOpenningMillisTotal", stat.getResultSetStat().getAliveMillisTotal()); map.put("ResultSetLastErrorTime", stat.getResultSetStat().getLastErrorTime()); - Throwable lastResultSetError = stat.getResultSetStat().getLastError(); - if (lastResultSetError != null) { - map.put("ResultSetLastErrorMessage", lastResultSetError.getMessage()); - map.put("ResultSetLastErrorStackTrace", IOUtils.getStackTrace(lastResultSetError)); - } else { - map.put("ResultSetLastErrorMessage", null); - map.put("ResultSetLastErrorStackTrace", null); - } + map.put("ResultSetLastErrorMessage", null); + map.put("ResultSetLastErrorStackTrace", null); // 35 - 39 map.put("ConnectionConnectCount", createErrorCount); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java index 06828f04d4..dd3424f76c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java @@ -44,7 +44,15 @@ public class DruidDataSourceTest_oracle2 extends TestCase { dataSource.setUseOracleImplicitCache(false); Assert.assertNull(dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); + dataSource.setUseOracleImplicitCache(true); dataSource.setUseOracleImplicitCache(true); Assert.assertEquals("true", dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); + + dataSource.setUseOracleImplicitCache(false); + Assert.assertNull(dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); + dataSource.setDriver(null); + + dataSource.setUseOracleImplicitCache(true); + Assert.assertNull(dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); } }