Hybris95
2014-04-18 f3b1e099e6ae252f1f1296ce5415b85fef6361cf
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);
   }