diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-17 11:31:16 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-17 11:31:16 -0600 |
| commit | 8da53958ed0980a327ec50738aafd588304b9c73 (patch) | |
| tree | c621d1768fa3cd025568958e859ce28e4b5caee0 | |
| parent | 4ff1429245b3748372643251a92d71821f257ccf (diff) | |
| parent | 7f19d37fe413aecbc0749dea83128b5dcbabf515 (diff) | |
| download | gitblit-8da53958ed0980a327ec50738aafd588304b9c73.tar.gz gitblit-8da53958ed0980a327ec50738aafd588304b9c73.zip | |
Merged #34 "Fix NPE in FileTicketService on finding all journals"
| -rw-r--r-- | 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 003f86ca..2247a66c 100644 --- a/src/main/java/com/gitblit/tickets/FileTicketService.java +++ b/src/main/java/com/gitblit/tickets/FileTicketService.java @@ -264,11 +264,15 @@ public class FileTicketService extends ITicketService { 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); } } |