svn commit: r1382037 - in /nutch/branches/2.x: CHANGES.txt src/java/org/apache/nutch/crawl/DbUpdateReducer.java

[ferdy]

Author: ferdy
Date: Fri Sep  7 14:19:47 2012
New Revision: 1382037

URL: http://svn.apache.org/viewvc?rev=1382037&view=rev
Log:
NUTCH-1456 Updater not setting batchId in markers correctly. (Alexander Kingson 
via ferdy)

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/src/java/org/apache/nutch/crawl/DbUpdateReducer.java

Modified: nutch/branches/2.x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1382037&r1=1382036&r2=1382037&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Fri Sep  7 14:19:47 2012
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Release 2.1 - Current Development
 
+* NUTCH-1456 Updater not setting batchId in markers correctly. (Alexander 
Kingson via ferdy)
+
 * NUTCH-1459 Remove dead code (phase2) from InjectorJob (ferdy)
 
 * NUTCH-1431 Introduce link 'distance' and add configurable max distance in 
the generator (ferdy)

Modified: 
nutch/branches/2.x/src/java/org/apache/nutch/crawl/DbUpdateReducer.java
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/crawl/DbUpdateReducer.java?rev=1382037&r1=1382036&r2=1382037&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/crawl/DbUpdateReducer.java 
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/crawl/DbUpdateReducer.java Fri 
Sep  7 14:19:47 2012
@@ -192,9 +192,10 @@ extends GoraReducer<UrlWithScore, NutchW
     }
     Mark.GENERATE_MARK.removeMarkIfExist(page);
     Mark.FETCH_MARK.removeMarkIfExist(page);
-    Utf8 mark = Mark.PARSE_MARK.removeMarkIfExist(page);
-    if (mark != null) {
-      Mark.UPDATEDB_MARK.putMark(page, mark);
+    Utf8 parse_mark = Mark.PARSE_MARK.checkMark(page);
+    if (parse_mark != null) {
+      Mark.UPDATEDB_MARK.putMark(page, parse_mark);
+      Mark.PARSE_MARK.removeMark(page);
     }
 
     context.write(keyUrl, page);