[findbugs] Null check on logging merge change in patchset receive pack

James Moger

2014-04-17 80c3ef7b8fd0daee7e85beb6b10f8a7a40efb3de

[findbugs] Null check on logging merge change in patchset receive pack

 src/main/java/com/gitblit/git/PatchsetReceivePack.java

@@ -536,8 +536,10 @@
                        break;

                    }

                }

                sendError("Sorry, {0} already merged {1} from ticket {2,number,0} to {3}!",

                if (mergeChange != null) {

                    sendError("Sorry, {0} already merged {1} from ticket {2,number,0} to {3}!",

                        mergeChange.author, mergeChange.patchset, number, ticket.mergeTo);

                }

                sendRejection(cmd, "Ticket {0,number,0} already resolved", number);

                return null;

            } else if (!StringUtils.isEmpty(ticket.mergeTo)) {