Ensure Lucene ticket index is updated on repository deletion

diff --git a/releases.moxie b/releases.moxie
index 20726fe13f0eb84ef10dff63917355d9ab3a1e46..80f10ba5ea3da16f309f0c82fdf86d91f19d1c72 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -9,7 +9,8 @@ r22: {
     html: ~
     text: ~
     security: ~
-    fixes: ~
+    fixes:
+    - Ensure the Lucene ticket index is updated on repository deletion.
     changes: ~
     additions: ~
     dependencyChanges: ~

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index b706874ac9bd4a06675045a7d01d0c79871e658e..bbc8bd37975de3f4a4c08189c39c6e20cf49c5ab 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -180,9 +180,14 @@ public class GitBlit extends GitblitManager {
        @Override
        public boolean deleteRepository(String repositoryName) {
                RepositoryModel repository = repositoryManager.getRepositoryModel(repositoryName);
-               boolean success = repositoryManager.deleteRepository(repositoryName);
+               return deleteRepositoryModel(repository);
+       }
+
+       @Override
+       public boolean deleteRepositoryModel(RepositoryModel model) {
+               boolean success = repositoryManager.deleteRepositoryModel(model);
                if (success && ticketService != null) {
-                       return ticketService.deleteAll(repository);
+                       return ticketService.deleteAll(model);
                }
                return success;
        }