From 1f4cc634ec72934d5f71131e91cf0ff8cdf7d9e5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 10 Apr 2014 12:10:56 -0400 Subject: [PATCH] Remove unused/garbage artifact from an earlier merge --- src/main/java/com/gitblit/tickets/FileTicketService.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java index 8375a2b..2247a66 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -25,8 +25,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import javax.inject.Inject; - import org.eclipse.jgit.lib.Repository; import com.gitblit.Constants; @@ -58,7 +56,6 @@ private final Map<String, AtomicLong> lastAssignedId; - @Inject public FileTicketService( IRuntimeManager runtimeManager, INotificationManager notificationManager, @@ -267,11 +264,15 @@ private List<File> findAll(File dir, String filename) { List<File> list = new ArrayList<File>(); - for (File file : dir.listFiles()) { + File [] files = dir.listFiles(); + if (files == null) { + return list; + } + for (File file : files) { if (file.isDirectory()) { list.addAll(findAll(file, filename)); } else if (file.isFile()) { - if (file.getName().equals(filename)) { + if (file.getName().equalsIgnoreCase(filename)) { list.add(file); } } -- Gitblit v1.9.1