You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/01/25 20:17:31 UTC
svn commit: r1438655 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/update/UpdateLog.java
Author: markrmiller
Date: Fri Jan 25 19:17:31 2013
New Revision: 1438655
URL: http://svn.apache.org/viewvc?rev=1438655&view=rev
Log:
SOLR-4359: The RecentUpdates#update method should treat a problem reading the next record the same as a problem parsing the record - log the exception and break.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1438655&r1=1438654&r2=1438655&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Jan 25 19:17:31 2013
@@ -83,6 +83,10 @@ Bug Fixes
* SOLR-4349 : Admin UI - Query Interface does not work in IE
(steffkes)
+* SOLR-4359: The RecentUpdates#update method should treat a problem reading the
+ next record the same as a problem parsing the record - log the exception and
+ break. (Mark Miller)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1438655&r1=1438654&r2=1438655&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java Fri Jan 25 19:17:31 2013
@@ -917,10 +917,11 @@ public class UpdateLog implements Plugin
reader = oldLog.getReverseReader();
while (numUpdates < numRecordsToKeep) {
- Object o = reader.next();
- if (o==null) break;
+ Object o = null;
try {
-
+ o = reader.next();
+ if (o==null) break;
+
// should currently be a List<Oper,Ver,Doc/Id>
List entry = (List)o;