Refine branch and pages servlets

James Moger

2014-05-04 1946fe76331b37c5a3be97268f0e3b0e58f3bb00

 src/main/java/com/gitblit/utils/JGitUtils.java

@@ -2256,8 +2256,10 @@
         }
      } catch (IOException e) {
         LOGGER.error("Failed to determine canMerge", e);
      } finally {
         revWalk.release();
      } finally {

         if (revWalk != null) {
            revWalk.release();

         }
      }
      return MergeStatus.NOT_MERGEABLE;
   }
@@ -2347,8 +2349,10 @@
         }
      } catch (IOException e) {
         LOGGER.error("Failed to merge", e);
      } finally {
         revWalk.release();
      } finally {

         if (revWalk != null) {
            revWalk.release();

         }
      }
      return new MergeResult(MergeStatus.FAILED, null);
   }