[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Libstreamanalyzer] a6a7f0f: Also remove stale lock files if we don't
From:       Till Adam <till () kdab ! com>
Date:       2010-12-29 15:15:08
Message-ID: 20101229151508.1E7A1A6090 () git ! kde ! org
[Download RAW message or body]

commit a6a7f0fee7aa1842790ff822a85189c447101b4c
branch master
Author: Till Adam <till@kdab.com>
Date:   Wed Dec 29 16:13:07 2010 +0100

    Also remove stale lock files if we don't expect them to be there.
    
    Previous runs might have left the clucene index folder locked, so
    make sure to clean up those properly as well. Otherwise we silently
    fail, which is suboptimal.

diff --git a/plugins/indexers/cluceneindexer/cluceneindexmanager.cpp \
b/plugins/indexers/cluceneindexer/cluceneindexmanager.cpp index 39bc307..5db504d \
                100644
--- a/plugins/indexers/cluceneindexer/cluceneindexmanager.cpp
+++ b/plugins/indexers/cluceneindexer/cluceneindexmanager.cpp
@@ -129,13 +129,11 @@ CLuceneIndexManager::derefWriter() {
 void
 CLuceneIndexManager::openWriter(bool truncate) {
     if (directory == 0) return;
+    if (IndexReader::isLocked(directory)) {
+        IndexReader::unlock(directory);
+    }
     try {
         bool create = truncate || !IndexReader::indexExists(directory);
-        if (!create) {
-            if (IndexReader::isLocked(directory)) {
-                IndexReader::unlock(directory);
-            }
-        }
         indexwriter = new IndexWriter(directory, analyzer, create);
     } catch (CLuceneError& err) {
         fprintf(stderr, "could not create writer: %s\n", err.what());


[prev in list] [next in list] [prev in thread] [next in thread]