https://issues.apache.org/bugzilla/show_bug.cgi?id=49241

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

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 3a431da..5aec25a 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -109,6 +109,8 @@ public class DataSourceFactory implements ObjectFactory {
     protected static final String PROP_DATASOURCE= "dataSource";
     protected static final String PROP_DATASOURCE_JNDI = "dataSourceJNDI";
     
+    protected static final String PROP_SUSPECT_TIMEOUT = "suspectTimeout";
+    
     
     public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
     
@@ -452,6 +454,11 @@ public class DataSourceFactory implements ObjectFactory {
         if (value != null) {
             poolProperties.setDataSourceJNDI(value);
         }
+
+        value = properties.getProperty(PROP_SUSPECT_TIMEOUT);
+        if (value != null) {
+            poolProperties.setSuspectTimeout(Integer.parseInt(value));
+        }
         return poolProperties;
     }