From 8da53958ed0980a327ec50738aafd588304b9c73 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 13:31:16 -0400
Subject: [PATCH] Merged #34 "Fix NPE in FileTicketService on finding all journals"
---
src/main/java/com/gitblit/tickets/FileTicketService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/FileTicketService.java b/src/main/java/com/gitblit/tickets/FileTicketService.java
index 003f86c..2247a66 100644
--- a/src/main/java/com/gitblit/tickets/FileTicketService.java
+++ b/src/main/java/com/gitblit/tickets/FileTicketService.java
@@ -264,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