From e2b36b7180d67b19d005f8c45d10d4b462546fde Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 4 Jul 2013 15:41:43 +0800 Subject: [PATCH] improve error info --- .../com/alibaba/druid/pool/DruidDataSource.java | 14 +++++++++----- .../druid/pool/GetConnectionTimeoutException.java | 8 ++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 90d200717c..909c478aee 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1317,10 +1317,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat empty.signal(); // send signal to CreateThread create connection if (estimate <= 0) { + String errorMessage = "loopWaitCount " + i + ", wait millis " + (nanos - estimate) / (1000 * 1000) + + ", active " + activeCount; + if (this.createError == null) { - throw new GetConnectionTimeoutException(createError); + throw new GetConnectionTimeoutException(errorMessage, createError); } else { - throw new GetConnectionTimeoutException(); + throw new GetConnectionTimeoutException(errorMessage); } } @@ -1354,11 +1357,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat continue; } + String errorMessage = "loopWaitCount " + i + ", wait millis " + (nanos - estimate) / (1000 * 1000) + + ", active " + activeCount; if (createError != null) { - throw new GetConnectionTimeoutException(createError); + throw new GetConnectionTimeoutException(errorMessage, createError); } else { - throw new GetConnectionTimeoutException("loopWaitCount " + i + ", wait millis " - + (nanos - estimate) / (1000 * 1000)); + throw new GetConnectionTimeoutException(errorMessage); } } } diff --git a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java index e40b0c2cc2..368fb1b625 100644 --- a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java +++ b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java @@ -20,17 +20,13 @@ import java.sql.SQLException; public class GetConnectionTimeoutException extends SQLException { private static final long serialVersionUID = 1L; - - public GetConnectionTimeoutException(){ - super(); - } public GetConnectionTimeoutException(String reason){ super(reason); } - public GetConnectionTimeoutException(Throwable cause){ - super(cause); + public GetConnectionTimeoutException(String mesage, Throwable cause){ + super(mesage, cause); } }