Fix bug in migrating to BranchTicketService

diff --git a/src/main/java/com/gitblit/tickets/BranchTicketService.java b/src/main/java/com/gitblit/tickets/BranchTicketService.java
index 8c000550a00eb7edc8d71c5d34c70eb6fbabc28a..5a42c6a7de271bbac22abea0551f124c055b555b 100644 (file)
--- a/src/main/java/com/gitblit/tickets/BranchTicketService.java
+++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java
@@ -823,8 +823,12 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi
                List<DirCacheEntry> list = new ArrayList<DirCacheEntry>();
                TreeWalk tw = null;
                try {
-                       tw = new TreeWalk(db);
                        ObjectId treeId = db.resolve(BRANCH + "^{tree}");
+                       if (treeId == null) {
+                               // branch does not exist yet, could be migrating tickets
+                               return list;
+                       }
+                       tw = new TreeWalk(db);
                        int hIdx = tw.addTree(treeId);
                        tw.setRecursive(true);