From 92a33bc2ef40a7252ca8800cc48657afe66db2ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Revert "Implementation of the getTickets capability of recovering all tickets from a nullable RepositoryModel"
---
src/main/java/com/gitblit/tickets/FileTicketService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java
index 7fd9675..ea5d065 100644
--- a/src/main/java/com/gitblit/tickets/FileTicketService.java
+++ b/src/main/java/com/gitblit/tickets/FileTicketService.java
@@ -228,7 +228,6 @@
for(int i = 0; i < databases.size(); i++)
{
Repository db = databases.get(i);
- RepositoryModel model = models.get(i);
try {
// Collect the set of all json files
File dir = new File(db.getDirectory(), TICKETS_PATH);
@@ -254,12 +253,12 @@
long ticketId = Long.parseLong(tid);
List<Change> changes = TicketSerializer.deserializeJournal(json);
if (ArrayUtils.isEmpty(changes)) {
- log.warn("Empty journal for {}:{}", model, journal);
+ log.warn("Empty journal for {}:{}", models.get(i), journal);
continue;
}
TicketModel ticket = TicketModel.buildTicket(changes);
- ticket.project = model.projectPath;
- ticket.repository = model.name;
+ ticket.project = models.get(i).projectPath;
+ ticket.repository = models.get(i).name;
ticket.number = ticketId;
// add the ticket, conditionally, to the list
@@ -272,7 +271,7 @@
}
} catch (Exception e) {
log.error("failed to deserialize {}/{}\n{}",
- new Object [] { model, journal, e.getMessage()});
+ new Object [] { models.get(i), journal, e.getMessage()});
log.error(null, e);
}
}
--
Gitblit v1.9.1