Tom
2014-10-26 df0ba7f7ff02ed02c0ba7714ae928a79d932baef
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);
      }