diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-02-01 00:28:05 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-02-01 00:28:05 +0100 |
| commit | 48aae36a22455fbb7553054003de0be69b2b5311 (patch) | |
| tree | 3662ace2a426a216b0490b5fa1f1f178979b491b /org.eclipse.jgit/src/org/eclipse/jgit | |
| parent | 8dcb86b602c02f8f3f310f2b3a5b13ef4bb5f11b (diff) | |
| parent | 788f439c0e62a9502e470e9c8789e9386c91bd58 (diff) | |
| download | jgit-48aae36a22455fbb7553054003de0be69b2b5311.tar.gz jgit-48aae36a22455fbb7553054003de0be69b2b5311.zip | |
Merge branch 'stable-6.0'
* stable-6.0:
Fix warning: The value of the parameter otp is not used
Change-Id: I47996285c49ce85ab0bb835956a9ef58ed71de20
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 289c732f4e..6e74136c1b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -50,7 +50,6 @@ import org.eclipse.jgit.errors.UnsupportedPackIndexVersionException; import org.eclipse.jgit.errors.UnsupportedPackVersionException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.BinaryDelta; -import org.eclipse.jgit.internal.storage.pack.ObjectToPack; import org.eclipse.jgit.internal.storage.pack.PackOutputStream; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; @@ -384,7 +383,7 @@ public class Pack implements Iterable<PackIndex.MutableEntry> { final void copyAsIs(PackOutputStream out, LocalObjectToPack src, boolean validate, WindowCursor curs) throws IOException, StoredObjectRepresentationNotAvailableException { - beginCopyAsIs(src); + beginCopyAsIs(); try { copyAsIs2(out, src, validate, curs); } finally { @@ -604,7 +603,7 @@ public class Pack implements Iterable<PackIndex.MutableEntry> { throw new EOFException(); } - private synchronized void beginCopyAsIs(ObjectToPack otp) + private synchronized void beginCopyAsIs() throws StoredObjectRepresentationNotAvailableException { if (++activeCopyRawData == 1 && activeWindows == 0) { try { |