Scarab commit: svn commit: r10345 - trunk: . src/conf/conf

Author: ronvoe122
Date: 2006-11-08 08:52:17-0800
New Revision: 10345

Modified:
   trunk/   (props changed)
   trunk/src/conf/conf/Torque.properties

Log:
Merged revisions 10321 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10321 | ronvoe122 | 2006-11-02 20:20:55 +0100 (Do, 02 Nov 2006) | 2 lines
  
  Set maxWait in Torque.properties to 30 seconds.
  That means that the connection pool throws an exception, if it still has not delivered a connection after waiting 30 seconds.
........


Modified: trunk/src/conf/conf/Torque.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/Torque.properties?view=diff&rev=10345&p1=trunk/src/conf/conf/Torque.properties&p2=trunk/src/conf/conf/Torque.properties&r1=10344&r2=10345
==============================================================================
--- trunk/src/conf/conf/Torque.properties	(original)
+++ trunk/src/conf/conf/Torque.properties	2006-11-08 08:52:17-0800
@@ -49,6 +49,7 @@
 torque.dsfactory.scarab.pool.maxActive=10
 torque.dsfactory.scarab.pool.testOnBorrow=false
 torque.dsfactory.scarab.pool.validationQuery=SELECT 1
+torque.dsfactory.scarab.pool.maxWait=30000
 torque.dsfactory.scarab.connection.driver=org.gjt.mm.mysql.Driver
 torque.dsfactory.scarab.connection.url=jdbc:mysql://localhost:3306/scarab?
 torque.dsfactory.scarab.connection.user=sa