You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/08/08 03:38:21 UTC
svn commit: r1370629 -
/manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Author: kwright
Date: Wed Aug 8 01:38:21 2012
New Revision: 1370629
URL: http://svn.apache.org/viewvc?rev=1370629&view=rev
Log:
Fix a transaction mismatch
Modified:
manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Modified: manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1370629&r1=1370628&r2=1370629&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Wed Aug 8 01:38:21 2012
@@ -2518,9 +2518,6 @@ public class JobManager implements IJobM
{
long sleepAmt = 0L;
database.beginTransaction(database.TRANSACTION_SERIALIZED);
-
- // Start the transaction now
- database.beginTransaction();
try
{
// Do one row at a time, to avoid deadlocking things
@@ -2539,7 +2536,7 @@ public class JobManager implements IJobM
String query = database.buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(jobQueue.idField,dd.getID())});
IResultSet set = database.performQuery("SELECT "+jobQueue.statusField+" FROM "+jobQueue.getTableName()+" WHERE "+
- query+" FOR UPDATE",list,null,null);
+ query /*+" FOR UPDATE"*/,list,null,null);
if (set.getRowCount() > 0)
{
IResultRow row = set.getRow(0);