commit 7070ce225267cd024d0a2f06d0c03f8011774def
author Edwin Kempin <ekempin@google.com> Fri Mar 03 09:38:21 2017 +0100
committer Edwin Kempin <ekempin@google.com> Fri Mar 03 09:39:23 2017 +0100
tree 08bfbd3f25b22e83c0372629f2de8b725dda716e
parent 5761ad491a90c6a3b54d77346008211002a6d2dd
parent 275eeaa3ab917696da1a20b3a9fba56eca8ecc6c

Merge branch 'stable-2.13'

* stable-2.13:
  Fix reviewnotes export

Change-Id: I721d822ec027db64d33ba9a9839216c90680a3d8
Signed-off-by: Edwin Kempin <ekempin@google.com>

src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
index 9137e63..520ae0a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Maps;
+import com.google.common.collect.MultimapBuilder;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -72,8 +73,11 @@
 
   private ListMultimap<Project.NameKey, ChangeNotes> mergedChanges() {
     try (ReviewDb db = database.open()) {
-      return notesFactory.create(
-          db, notes -> notes.getChange().getStatus() == Change.Status.MERGED);
+      return MultimapBuilder.hashKeys()
+          .arrayListValues()
+          .build(
+              notesFactory.create(
+                  db, notes -> notes.getChange().getStatus() == Change.Status.MERGED));
     } catch (OrmException | IOException e) {
       stderr.println("Cannot read changes from database " + e.getMessage());
       return ImmutableListMultimap.of();