manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1396528 - in /manifoldcf/branches/release-1.0-branch: ./ CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Date Wed, 10 Oct 2012 09:59:55 GMT
Author: kwright
Date: Wed Oct 10 09:59:55 2012
New Revision: 1396528

URL: http://svn.apache.org/viewvc?rev=1396528&view=rev
Log:
Pull up changes for CONNECTORS-551.

Modified:
    manifoldcf/branches/release-1.0-branch/   (props changed)
    manifoldcf/branches/release-1.0-branch/CHANGES.txt
    manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java

Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1396295

Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1396528&r1=1396527&r2=1396528&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Wed Oct 10 09:59:55 2012
@@ -1,7 +1,15 @@
 ManifoldCF Change Log
 $Id$
 
-======================= 1.0 =====================
+======================= Release 1.0.1 =====================
+
+CONNECTORS-551: Resetting agents process causes job's seed
+documents to be flipped into the PURGATORY state, which in turn
+may cause the documents to be deleted and the job to be shut down
+if the seed documents are the only documents.
+(Martin Gielow, Karl Wright)
+
+======================= Release 1.0 =====================
 
 CONNECTORS-549: Wrong credentials not correctly managed by CMIS Connector
 (Piergiorgio Lucidi)

Modified: manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1396528&r1=1396527&r2=1396528&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
(original)
+++ manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Wed Oct 10 09:59:55 2012
@@ -346,6 +346,7 @@ public class JobQueue extends org.apache
     performUpdate(map,"WHERE "+query,list,null);
 
     // Map newseed fields to seed
+    map.clear();
     map.put(isSeedField,seedstatusToString(SEEDSTATUS_SEED));
     list.clear();
     query = buildConjunctionClause(list,new ClauseDescription[]{
@@ -354,7 +355,7 @@ public class JobQueue extends org.apache
 
     // Clear out all failtime fields (since we obviously haven't been retrying whilst we
were not
     // running)
-    map = new HashMap();
+    map.clear();
     map.put(failTimeField,null);
     list.clear();
     query = buildConjunctionClause(list,new ClauseDescription[]{
@@ -542,7 +543,7 @@ public class JobQueue extends org.apache
       new UnitaryClause(statusField,statusToString(STATUS_PENDING))});
     performDelete("WHERE "+query,list,null);
 
-    // Turn PENDINGPURGATORY, COMPLETED into PURGATORY.
+    // Turn PENDINGPURGATORY and COMPLETED into PURGATORY.
     HashMap map = new HashMap();
     map.put(statusField,statusToString(STATUS_PURGATORY));
     map.put(checkTimeField,new Long(0L));
@@ -553,7 +554,7 @@ public class JobQueue extends org.apache
     // than being set back to some arbitrary value.
     // The alternative, which would be to reprioritize all the documents at this point, is
somewhat attractive, but let's see if we can get away
     // without for now.
-
+      
     list.clear();
     query = buildConjunctionClause(list,new ClauseDescription[]{
       new UnitaryClause(jobIDField,jobID),



Mime
View raw message