summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-27 09:01:43 -0400
committerJames Moger <james.moger@gitblit.com>2014-03-27 09:01:43 -0400
commitfcaeaa54102a8de9f36cdfd67b12fa4c540b1197 (patch)
tree9bf13f8793517d4bc9f46c1eacba2a8d5cbe7dee
parent33ef3c2fb81744ed3f21a64f30a818531f1dd7e9 (diff)
downloadgitblit-fcaeaa54102a8de9f36cdfd67b12fa4c540b1197.tar.gz
gitblit-fcaeaa54102a8de9f36cdfd67b12fa4c540b1197.zip
Ensure Lucene ticket index is updated on repository deletion
-rw-r--r--releases.moxie3
-rw-r--r--src/main/java/com/gitblit/GitBlit.java9
2 files changed, 9 insertions, 3 deletions
diff --git a/releases.moxie b/releases.moxie
index 20726fe1..80f10ba5 100644
--- 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 b706874a..bbc8bd37 100644
--- 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;
}