James Moger
2014-04-17 dfd6f5d75aebd7a0a41305831ec6d194ae092f5d
[findbugs] Fix potential NPE in DiffStat generation
1 files modified
6 ■■■■ changed files
src/main/java/com/gitblit/utils/DiffUtils.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/utils/DiffUtils.java
@@ -363,19 +363,19 @@
    public static DiffStat getDiffStat(Repository repository, String base, String tip) {
        RevCommit baseCommit = null;
        RevCommit tipCommit = null;
        RevWalk revWalk = null;
        RevWalk revWalk = new RevWalk(repository);
        try {
            revWalk = new RevWalk(repository);
            tipCommit = revWalk.parseCommit(repository.resolve(tip));
            if (!StringUtils.isEmpty(base)) {
                baseCommit = revWalk.parseCommit(repository.resolve(base));
            }
            return getDiffStat(repository, baseCommit, tipCommit, null);
        } catch (Exception e) {
            LOGGER.error("failed to generate diffstat!", e);
        } finally {
            revWalk.dispose();
        }
        return getDiffStat(repository, baseCommit, tipCommit, null);
        return null;
    }
    public static DiffStat getDiffStat(Repository repository, RevCommit commit) {