commit | 2b838b02dd9ce0c57da7973349e36228fb98caf4 | [log] [tgz] |
---|---|---|
author | David Ostrovsky <david.ostrovsky@gmail.com> | Thu May 02 12:52:47 2024 +0000 |
committer | Gerrit Code Review <support@gerrithub.io> | Thu May 02 12:52:47 2024 +0000 |
tree | 52a2ecfdf4197d558cd2e9e94cae084e3eab15b3 | |
parent | ca0261ab184593016ffc7f2e9ea9a19cf2b1861a [diff] | |
parent | 7c1a6a005f5c8fd170b13fc6b566711307e296ae [diff] |
Merge "Bazel: Replace deprecated --experimental_strict_action_env option"
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index c42d1c8..c2c3775 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java
@@ -228,7 +228,7 @@ * etc. Positions past 2**31-1 are negative, but still valid. * @return the offset in a pack for the corresponding entry. */ - abstract long getOffset(long nthPosition); + protected abstract long getOffset(long nthPosition); /** * Locate the file offset position for the requested object.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index 4563c90..5180df4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java
@@ -118,7 +118,7 @@ } @Override - long getOffset(long nthPosition) { + protected long getOffset(long nthPosition) { final int levelOne = findLevelOne(nthPosition); final int levelTwo = getLevelTwo(nthPosition, levelOne); final int p = (4 + Constants.OBJECT_ID_LENGTH) * levelTwo;