You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/05/03 18:12:22 UTC
svn commit: r1478855 - in /lucene/dev/trunk: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
Author: mikemccand
Date: Fri May 3 16:12:22 2013
New Revision: 1478855
URL: http://svn.apache.org/r1478855
Log:
LUCENE-4976: fix Solr IndexDeletionPolicy impls to handle empty commits onInit
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/core/ (props changed)
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java?rev=1478855&r1=1478854&r2=1478855&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java Fri May 3 16:12:22 2013
@@ -237,7 +237,9 @@ public final class IndexDeletionPolicyWr
map.put(wrapper.delegate.getGeneration(), wrapper.delegate);
}
solrVersionVsCommits = map;
- latestCommit = ((list.get(list.size() - 1)).delegate);
+ if (!list.isEmpty()) {
+ latestCommit = ((list.get(list.size() - 1)).delegate);
+ }
}
public static long getCommitTimestamp(IndexCommit commit) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java?rev=1478855&r1=1478854&r2=1478855&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java Fri May 3 16:12:22 2013
@@ -79,6 +79,9 @@ public class SolrDeletionPolicy extends
@Override
public void onInit(List commits) throws IOException {
// SOLR-4547: log basic data at INFO, add filenames at DEBUG.
+ if (commits.isEmpty()) {
+ return;
+ }
log.info("SolrDeletionPolicy.onInit: commits: {}",
new CommitsLoggingInfo(commits));
log.debug("SolrDeletionPolicy.onInit: commits: {}",