From: kfujino <kfujino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Sep 2011 10:54:05 +0000 (+0000)
Subject: validatorClassName and suspectTimeout are ignored.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d7b9a98cb4ab4f110618a0598462436379dacd49;p=tomcat7.0

validatorClassName and suspectTimeout are ignored.
In order to support them correctly, validatorClassName and suspectTimeout are added to  property list.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166619 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 32e5a4ed6..1228b1dd1 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -142,6 +142,7 @@ public class DataSourceFactory implements ObjectFactory {
         PROP_URL,
         PROP_USERNAME,
         PROP_VALIDATIONQUERY,
+        PROP_VALIDATOR_CLASS_NAME,
         PROP_VALIDATIONINTERVAL,
         PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
         PROP_REMOVEABANDONED,
@@ -161,6 +162,7 @@ public class DataSourceFactory implements ObjectFactory {
         PROP_USE_CON_LOCK,
         PROP_DATASOURCE,
         PROP_DATASOURCE_JNDI,
+        PROP_SUSPECT_TIMEOUT,
         PROP_ALTERNATE_USERNAME_ALLOWED
     };