Tom
2014-11-06 6e55f53a790145dbbe78b8860004e4743e47acf1
src/main/java/com/gitblit/utils/DiffUtils.java
@@ -228,15 +228,16 @@
      DiffStat stat = null;
      String diff = null;
      try {
         final ByteArrayOutputStream os = new ByteArrayOutputStream();
         ByteArrayOutputStream os = null;
         RawTextComparator cmp = RawTextComparator.DEFAULT;
         DiffFormatter df;
         switch (outputType) {
         case HTML:
            df = new GitBlitDiffFormatter(os, commit.getName());
            df = new GitBlitDiffFormatter(commit.getName(), path);
            break;
         case PLAIN:
         default:
            os = new ByteArrayOutputStream();
            df = new DiffFormatter(os);
            break;
         }
@@ -271,6 +272,7 @@
         } else {
            df.format(diffEntries);
         }
         df.flush();
         if (df instanceof GitBlitDiffFormatter) {
            // workaround for complex private methods in DiffFormatter
            diff = ((GitBlitDiffFormatter) df).getHtml();
@@ -278,7 +280,6 @@
         } else {
            diff = os.toString();
         }
         df.flush();
      } catch (Throwable t) {
         LOGGER.error("failed to generate commit diff!", t);
      }
@@ -363,19 +364,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) {