diff options
| author | James Moger <james.moger@gitblit.com> | 2014-10-31 09:19:03 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-10-31 09:19:03 -0400 |
| commit | 48ca8a006d6c96af0b134ebf07daa35eb367d5d8 (patch) | |
| tree | b47cebe83f1dd85b9c5970f4152735ed76e96d9c | |
| parent | f11592770694e9d0a391a31fa23f455bc05756c1 (diff) | |
| download | gitblit-48ca8a006d6c96af0b134ebf07daa35eb367d5d8.tar.gz gitblit-48ca8a006d6c96af0b134ebf07daa35eb367d5d8.zip | |
Fix exception in FileTicketService when deleting a repository
| -rw-r--r-- | releases.moxie | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/tickets/FileTicketService.java | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/releases.moxie b/releases.moxie index 5fead38d..41259a7d 100644 --- a/releases.moxie +++ b/releases.moxie @@ -16,6 +16,7 @@ r27: { security: ~ fixes: - Fix exception when viewing a ticket with a patchset where the integration branch does not exist (issue-521, ticket-212) + - Fix exception when deleting a repository using the FileTicketService (issue-522, ticket-213) changes: - Replaced Dagger with Guice (ticket-80) - Use release name as root directory in Gitblit GO artifacts (ticket-109) diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index c8346d14..1e82f0de 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -493,6 +493,10 @@ public class FileTicketService extends ITicketService { @Override protected boolean deleteAllImpl(RepositoryModel repository) { Repository db = repositoryManager.getRepository(repository.name); + if (db == null) { + // the tickets no longer exist because the db no longer exists + return true; + } try { File dir = new File(db.getDirectory(), TICKETS_PATH); return FileUtils.delete(dir); |