svn commit: r952321 - /incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java

[kw...@apache.org]

Author: kwright
Date: Mon Jun  7 16:25:07 2010
New Revision: 952321

URL: http://svn.apache.org/viewvc?rev=952321&view=rev
Log:
Another derby issue: detecting deadlock.

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

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java?rev=952321&r1=952320&r2=952321&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java Mon Jun  7 16:25:07 2010
@@ -581,9 +581,7 @@ public class DBInterfaceDerby extends Da
     if (Logging.db.isDebugEnabled())
       Logging.db.debug("Exception "+theException.getMessage()+" is possibly a transaction abort signal");
     String message = e.getMessage();
-    if (message.indexOf("deadlock detected") != -1)
-      return new LCFException(message,e,LCFException.DATABASE_TRANSACTION_ABORT);
-    if (message.indexOf("could not serialize") != -1)
+    if (message.indexOf("due to a deadlock") != -1)
       return new LCFException(message,e,LCFException.DATABASE_TRANSACTION_ABORT);
     // Note well: We also have to treat 'duplicate key' as a transaction abort, since this is what you get when two threads attempt to
     // insert the same row.  (Everything only works, then, as long as there is a unique constraint corresponding to every bad insert that