motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-6.0' 

* stable-6.0:
  Fix warning: The value of the parameter otp is not used

Change-Id: I47996285c49ce85ab0bb835956a9ef58ed71de20
This commit is contained in:
Matthias Sohn 2022-02-01 00:28:05 +01:00
parent 8dcb86b602 788f439c0e
commit 48aae36a22
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java
View File

@ -50,7 +50,6 @@
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 @@ void copyPackAsIs(PackOutputStream out, WindowCursor curs)
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 @@ private void readFully(final long position, final byte[] dstbuf,
throw new EOFException();
}
private synchronized void beginCopyAsIs(ObjectToPack otp)
private synchronized void beginCopyAsIs()
throws StoredObjectRepresentationNotAvailableException {
if (++activeCopyRawData == 1 && activeWindows == 0) {
try {