From 1acab0204974b1339bf7fa4a1569f1a368721dca Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 4 Jan 2019 16:23:50 -0800 Subject: [PATCH] HackPushNegotiateHook: Avoid RefDatabase#getRefs Change-Id: I7682d55fa72674f3ebdf1e5758f6100f0016d4a3 --- .../gerrit/server/git/receive/HackPushNegotiateHook.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java b/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java index bf3d270e43..c6c48190a4 100644 --- a/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java +++ b/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.git.receive; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static java.util.stream.Collectors.toMap; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; @@ -78,7 +78,12 @@ public class HackPushNegotiateHook implements AdvertiseRefsHook { Map r = rp.getAdvertisedRefs(); if (r == null) { try { - r = rp.getRepository().getRefDatabase().getRefs(ALL); + r = + rp.getRepository() + .getRefDatabase() + .getRefs() + .stream() + .collect(toMap(Ref::getName, x -> x)); } catch (ServiceMayNotContinueException e) { throw e; } catch (IOException e) {