svn commit: r1001023 - /incubator/lcf/trunk/modules/framework/core/src/main/java/org/apache/acf/core/database/DBInterfaceDerby.java

[kw...@apache.org]

Author: kwright
Date: Fri Sep 24 18:41:28 2010
New Revision: 1001023

URL: http://svn.apache.org/viewvc?rev=1001023&view=rev
Log:
Fix for CONNECTORS-100. For Derby, insist on the lock timeout being infinite, since otherwise it will tend to get exceeded the first time anyone puts any load on the system.

Modified:
    incubator/lcf/trunk/modules/framework/core/src/main/java/org/apache/acf/core/database/DBInterfaceDerby.java

Modified: incubator/lcf/trunk/modules/framework/core/src/main/java/org/apache/acf/core/database/DBInterfaceDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/src/main/java/org/apache/acf/core/database/DBInterfaceDerby.java?rev=1001023&r1=1001022&r2=1001023&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/src/main/java/org/apache/acf/core/database/DBInterfaceDerby.java (original)
+++ incubator/lcf/trunk/modules/framework/core/src/main/java/org/apache/acf/core/database/DBInterfaceDerby.java Fri Sep 24 18:41:28 2010
@@ -44,6 +44,12 @@ public class DBInterfaceDerby extends Da
   // So, once we enter the serializable realm, STOP any additional transactions from doing anything at all.
   protected int serializableDepth = 0;
 
+  // Override the Derby default lock timeout, and make it wait indefinitely instead.
+  static
+  {
+    System.setProperty("derby.locks.waitTimeout","-1");
+  }
+  
   protected static String getFullDatabasePath(String databaseName)
     throws ACFException
   {