/*
 * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com> and other copyright
 * owners as documented in the project's IP log.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Distribution License v1.0 which accompanies this
 * distribution, is reproduced below, and is available at
 * http://www.eclipse.org/org/documents/edl-v10.php
 *
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 * - Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * - Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 *
 * - Neither the name of the Eclipse Foundation, Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from this
 * software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

package com.google.gerrit.server.git;

import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.notes.Note;
import org.eclipse.jgit.notes.NoteMerger;
import org.eclipse.jgit.util.io.UnionInputStream;

import java.io.ByteArrayInputStream;
import java.io.IOException;

class ReviewNoteMerger implements NoteMerger {
  @Override
  public Note merge(Note base, Note ours, Note theirs, ObjectReader reader,
      ObjectInserter inserter) throws IOException {
    if (ours == null) {
      return theirs;
    }
    if (theirs == null) {
      return ours;
    }
    if (ours.getData().equals(theirs.getData())) {
      return ours;
    }

    ObjectLoader lo = reader.open(ours.getData());
    byte[] sep = new byte[] {'\n'};
    ObjectLoader lt = reader.open(theirs.getData());
    UnionInputStream union = new UnionInputStream(
        lo.openStream(),
        new ByteArrayInputStream(sep),
        lt.openStream());
    ObjectId noteData = inserter.insert(Constants.OBJ_BLOB,
        lo.getSize() + sep.length + lt.getSize(), union);
    return new Note(ours, noteData);
  }
}

@@ -2162,24 +2162,66 @@
 jectReader;%0A
+import org.eclipse.jgit.lib.ObjectStream;%0A
 import org.e
@@ -2917,54 +2917,47 @@
     
-UnionInputStream union = new UnionInput
+try (ObjectStream os = lo.open
 Stream(
+);
 %0A   
@@ -2965,32 +2965,32 @@
     
-lo.openStream(),%0A       
+ByteArrayInputStream b =
  new
@@ -3015,25 +3015,25 @@
 eam(sep)
-,
+;
 %0A       
  lt.open
@@ -3024,16 +3024,34 @@
 %0A       
+ ObjectStream ts =
  lt.open
@@ -3058,19 +3058,88 @@
 Stream()
-)
 ;%0A
+        UnionInputStream union = new UnionInputStream(os, b, ts)) %7B%0A  
     Obje
@@ -3198,16 +3198,18 @@
         
+  
 lo.getSi
@@ -3250,24 +3250,26 @@
 union);%0A    
+  
 return new N
@@ -3289,14 +3289,20 @@
 eData);%0A
+    %7D%0A
   %7D%0A%7D%0A

Fix a resource leak