From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 28 Oct 2008 16:41:36 +0000 (+0000)
Subject: when the DB is down, don't wait and try over and over again, simply return the failure
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7c9c62d3c55d5f278ec88d3d63d940ed8159b15b;p=tomcat7.0

when the DB is down, don't wait and try over and over again, simply return the failure


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

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
index 79503699d..dc5afb8ed 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -477,8 +477,10 @@ public class ConnectionPool {
                     }
                     return con;
                 } else {
+                    //validation failed.
                     release(con);
                     setToNull = true;
+                    throw new SQLException("Failed to validate a newly established connection.");
                 }
             } catch (Exception x) {
                 release(con);                
@@ -495,7 +497,6 @@ public class ConnectionPool {
                 con = null;
             }
         }
-        return con;
     }
 
     /**