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 2012/12/18 21:04:22 UTC
svn commit: r1423611 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/update/UpdateHandler.java
Author: markrmiller
Date: Tue Dec 18 20:04:22 2012
New Revision: 1423611
URL: http://svn.apache.org/viewvc?rev=1423611&view=rev
Log:
SOLR-4203: dont check if ulog is set to delete tlogs files on startup - check if the tlog dir exists
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateHandler.java?rev=1423611&r1=1423610&r2=1423611&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateHandler.java Tue Dec 18 20:04:22 2012
@@ -85,8 +85,9 @@ public abstract class UpdateHandler impl
// not thread safe - for startup
private void clearLog(PluginInfo ulogPluginInfo) {
- if (ulog != null) {
- String[] files = UpdateLog.getLogList(UpdateLog.getTlogDir(ulogPluginInfo));
+ File tlogDir = UpdateLog.getTlogDir(ulogPluginInfo);
+ if (tlogDir.exists()) {
+ String[] files = UpdateLog.getLogList(tlogDir);
for (String file : files) {
File f = new File(file);
boolean s = f.delete();