From 7e4073dc1ae8ccaa3d9c1bb470259ef8a24e357c Mon Sep 17 00:00:00 2001 From: Patrick Hiesel Date: Thu, 18 Jul 2019 10:17:17 +0200 Subject: [PATCH] PureRevert: Don't write any output when computing diff DiffFormatter#scan does not require an output stream, so we can stop creating one. Change-Id: Ie8bfa526ff3a4e24640fdc9756ac1002246d716c --- java/com/google/gerrit/server/git/PureRevertCache.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/java/com/google/gerrit/server/git/PureRevertCache.java b/java/com/google/gerrit/server/git/PureRevertCache.java index e776509c80..6679b52d80 100644 --- a/java/com/google/gerrit/server/git/PureRevertCache.java +++ b/java/com/google/gerrit/server/git/PureRevertCache.java @@ -36,7 +36,6 @@ import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; import com.google.protobuf.ByteString; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutionException; @@ -50,6 +49,7 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.merge.ThreeWayMerger; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.util.io.DisabledOutputStream; /** Computes and caches if a change is a pure revert of another change. */ @Singleton @@ -188,9 +188,8 @@ public class PureRevertCache { } // Any differences between claimed original's parent and the rebase result indicate that - // the - // claimedRevert is not a pure revert but made content changes - try (DiffFormatter df = new DiffFormatter(new ByteArrayOutputStream())) { + // the claimedRevert is not a pure revert but made content changes + try (DiffFormatter df = new DiffFormatter(DisabledOutputStream.INSTANCE)) { df.setReader(oi.newReader(), repo.getConfig()); List entries = df.scan(claimedOriginalCommit.getParent(0), merger.getResultTreeId());