svn commit: r1459979 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java

[kkolinko]

Author: kkolinko
Date: Fri Mar 22 20:47:21 2013
New Revision: 1459979

URL: http://svn.apache.org/r1459979
Log:
Merged revision 1435760 from tomcat/trunk:
Fix broken test (it has been broken for a long time)
The timeout needs to be shorter than the sleep time so the connection is 
abandoned

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1435760

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java?rev=1459979&r1=1459978&r2=1459979&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java
 Fri Mar 22 20:47:21 2013
@@ -28,7 +28,7 @@ public class TwoDataSources extends Defa
         org.apache.tomcat.jdbc.pool.DataSource d1 = 
this.createDefaultDataSource();
         org.apache.tomcat.jdbc.pool.DataSource d2 = 
this.createDefaultDataSource();
         d1.setRemoveAbandoned(true);
-        d1.setRemoveAbandonedTimeout(10);
+        d1.setRemoveAbandonedTimeout(2);
         d1.setTimeBetweenEvictionRunsMillis(1000);
         d2.setRemoveAbandoned(false);
         Connection c1 = d1.getConnection();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org