From dd382e8ac9eb7287060a6dfde5227982cff8b888 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 28 Aug 2019 14:02:55 +0900 Subject: [PATCH] Revert "Stop using deprecated DirCacheEntry#setLastModified(long)" This reverts commit cba560d1fc26e7d757a28596a1d292537dec21fc. Reason for revert: The Jgit upgrade that made it necessary is being reverted. Bug: Issue 11373 Change-Id: I372023a611cfe02adc38827ceb6a66b5f9a67ce0 --- .../gerrit/server/edit/tree/ChangeFileContentModification.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java b/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java index 07dd147108..d91e2e8420 100644 --- a/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java +++ b/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java @@ -23,7 +23,6 @@ import com.google.common.io.ByteStreams; import com.google.gerrit.extensions.restapi.RawInput; import java.io.IOException; import java.io.InputStream; -import java.time.Instant; import java.util.Collections; import java.util.List; import org.eclipse.jgit.dircache.DirCacheEditor; @@ -80,7 +79,7 @@ public class ChangeFileContentModification implements TreeModification { try { if (dirCacheEntry.getFileMode() == FileMode.GITLINK) { dirCacheEntry.setLength(0); - dirCacheEntry.setLastModified(Instant.ofEpochMilli(0)); + dirCacheEntry.setLastModified(0); ObjectId newObjectId = ObjectId.fromString(getNewContentBytes(), 0); dirCacheEntry.setObjectId(newObjectId); } else {