LuceneExecutor could not delete the Lucene index from a working copy

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index ab81cb3e905e5dd32338b81302b277cfa7216fb7..624cb53f62afb69f31024c2780ecbfe645e09e0b 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -11,6 +11,7 @@ If you are updating from an earlier release AND you have indexed branches with t
 \r
 #### fixes\r
 \r
+- Gitblit could not delete a Lucene index in a working copy on index upgrade \r
 - Do not index submodule links (issue 119)\r
 - Restore original user or team object on failure to update (issue 118)\r
 - Fixes to relative path determination in repository search algorithm for symlinks (issue 116)\r

diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java
index 9cae3d52c83d23420b808ca878e9f93d1e036ada..42155f42adf87fe54122ac54a14d03ac61dd468e 100644 (file)
--- a/src/com/gitblit/LuceneExecutor.java
+++ b/src/com/gitblit/LuceneExecutor.java
@@ -286,7 +286,7 @@ public class LuceneExecutor implements Runnable {
                        close(repositoryName);\r
 \r
                        // delete the index folder\r
-                       File repositoryFolder = new File(repositoriesFolder, repositoryName);\r
+                       File repositoryFolder = FileKey.resolve(new File(repositoriesFolder, repositoryName), FS.DETECTED);\r
                        File luceneIndex = new File(repositoryFolder, LUCENE_DIR);\r
                        if (luceneIndex.exists()) {\r
                                org.eclipse.jgit.util.FileUtils.delete(luceneIndex,\r