Merge branch '2.6.x' into 2.7.x

Closes gh-31177
This commit is contained in:
Andy Wilkinson
2022-05-26 15:53:38 +01:00
70 changed files with 151 additions and 187 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -221,7 +221,7 @@ class CentralDirectoryEndRecord {
private final long offset;
private Zip64Locator(long offset, byte[] block) throws IOException {
private Zip64Locator(long offset, byte[] block) {
this.offset = offset;
this.zip64EndOffset = Bytes.littleEndianValue(block, ZIP64_LOCOFF, 8);
}