Skip to content

Commit 87b4c0e

Browse files
armsargisdiegomarquezp
armsargis
and
diegomarquezp
authored
Replace deprecated getNextTarEntry with getNextEntry and updated org.ow2.asm:asm to version 9.8. (#4418)
Co-authored-by: Diego Marquez <diegomarquezp@google.com>
1 parent 08a45ec commit 87b4c0e

File tree

7 files changed

+51
-51
lines changed

7 files changed

+51
-51
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ project.ext.dependencyStrings = [
3535
JACKSON_DATABIND: 'com.fasterxml.jackson.core:jackson-databind',
3636
JACKSON_DATAFORMAT_YAML: 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml',
3737
JACKSON_DATATYPE_JSR310: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310',
38-
ASM: 'org.ow2.asm:asm:9.5',
38+
ASM: 'org.ow2.asm:asm:9.8',
3939
PICOCLI: 'info.picocli:picocli:4.7.4',
4040

4141
MAVEN_API: 'org.apache.maven:maven-plugin-api:3.9.3',

‎jib-core/src/integration-test/java/com/google/cloud/tools/jib/api/ReproducibleImageTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void testTarballStructure() throws IOException {
9595
try (TarArchiveInputStream input =
9696
new TarArchiveInputStream(Files.newInputStream(imageTar.toPath()))) {
9797
TarArchiveEntry imageEntry;
98-
while ((imageEntry = input.getNextTarEntry()) != null) {
98+
while ((imageEntry = input.getNextEntry()) != null) {
9999
actual.add(imageEntry.getName());
100100
}
101101
}
@@ -218,14 +218,14 @@ private void layerEntriesDo(BiConsumer<String, TarArchiveEntry> layerConsumer)
218218
try (TarArchiveInputStream input =
219219
new TarArchiveInputStream(Files.newInputStream(imageTar.toPath()))) {
220220
TarArchiveEntry imageEntry;
221-
while ((imageEntry = input.getNextTarEntry()) != null) {
221+
while ((imageEntry = input.getNextEntry()) != null) {
222222
String imageEntryName = imageEntry.getName();
223223
// assume all .tar.gz files are layers
224224
if (imageEntry.isFile() && imageEntryName.endsWith(".tar.gz")) {
225225
@SuppressWarnings("resource") // must not close sub-streams
226226
TarArchiveInputStream layer = new TarArchiveInputStream(new GZIPInputStream(input));
227227
TarArchiveEntry layerEntry;
228-
while ((layerEntry = layer.getNextTarEntry()) != null) {
228+
while ((layerEntry = layer.getNextEntry()) != null) {
229229
layerConsumer.accept(imageEntryName, layerEntry);
230230
}
231231
}
@@ -238,7 +238,7 @@ private static String extractFromTarFileAsString(File tarFile, String filename)
238238
try (TarArchiveInputStream input =
239239
new TarArchiveInputStream(Files.newInputStream(tarFile.toPath()))) {
240240
TarArchiveEntry imageEntry;
241-
while ((imageEntry = input.getNextTarEntry()) != null) {
241+
while ((imageEntry = input.getNextEntry()) != null) {
242242
if (filename.equals(imageEntry.getName())) {
243243
return CharStreams.toString(new InputStreamReader(input, StandardCharsets.UTF_8));
244244
}

‎jib-core/src/main/java/com/google/cloud/tools/jib/tar/TarExtractor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public static void extract(Path source, Path destination, boolean enableReproduc
7171
List<TarArchiveEntry> entries = new ArrayList<>();
7272
try (InputStream in = new BufferedInputStream(Files.newInputStream(source));
7373
TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(in)) {
74-
for (TarArchiveEntry entry = tarArchiveInputStream.getNextTarEntry();
74+
for (TarArchiveEntry entry = tarArchiveInputStream.getNextEntry();
7575
entry != null;
76-
entry = tarArchiveInputStream.getNextTarEntry()) {
76+
entry = tarArchiveInputStream.getNextEntry()) {
7777
entries.add(entry);
7878
Path entryPath = destination.resolve(entry.getName());
7979

‎jib-core/src/test/java/com/google/cloud/tools/jib/image/ImageTarballTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,31 +105,31 @@ public void testWriteTo_docker()
105105
try (TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(in)) {
106106

107107
// Verifies layer with fileA was added.
108-
TarArchiveEntry headerFileALayer = tarArchiveInputStream.getNextTarEntry();
108+
TarArchiveEntry headerFileALayer = tarArchiveInputStream.getNextEntry();
109109
Assert.assertEquals(fakeDigestA.getHash() + ".tar.gz", headerFileALayer.getName());
110110
String fileAString =
111111
CharStreams.toString(
112112
new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8));
113113
Assert.assertEquals(Blobs.writeToString(Blobs.from(fileA)), fileAString);
114114

115115
// Verifies layer with fileB was added.
116-
TarArchiveEntry headerFileBLayer = tarArchiveInputStream.getNextTarEntry();
116+
TarArchiveEntry headerFileBLayer = tarArchiveInputStream.getNextEntry();
117117
Assert.assertEquals(fakeDigestB.getHash() + ".tar.gz", headerFileBLayer.getName());
118118
String fileBString =
119119
CharStreams.toString(
120120
new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8));
121121
Assert.assertEquals(Blobs.writeToString(Blobs.from(fileB)), fileBString);
122122

123123
// Verifies container configuration was added.
124-
TarArchiveEntry headerContainerConfiguration = tarArchiveInputStream.getNextTarEntry();
124+
TarArchiveEntry headerContainerConfiguration = tarArchiveInputStream.getNextEntry();
125125
Assert.assertEquals("config.json", headerContainerConfiguration.getName());
126126
String containerConfigJson =
127127
CharStreams.toString(
128128
new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8));
129129
JsonTemplateMapper.readJson(containerConfigJson, ContainerConfigurationTemplate.class);
130130

131131
// Verifies manifest was added.
132-
TarArchiveEntry headerManifest = tarArchiveInputStream.getNextTarEntry();
132+
TarArchiveEntry headerManifest = tarArchiveInputStream.getNextEntry();
133133
Assert.assertEquals("manifest.json", headerManifest.getName());
134134
String manifestJson =
135135
CharStreams.toString(
@@ -159,45 +159,45 @@ public void testWriteTo_oci()
159159
try (TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(in)) {
160160

161161
// Verifies layer with fileA was added.
162-
TarArchiveEntry headerFileALayer = tarArchiveInputStream.getNextTarEntry();
162+
TarArchiveEntry headerFileALayer = tarArchiveInputStream.getNextEntry();
163163
Assert.assertEquals("blobs/sha256/" + fakeDigestA.getHash(), headerFileALayer.getName());
164164
String fileAString =
165165
CharStreams.toString(
166166
new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8));
167167
Assert.assertEquals(Blobs.writeToString(Blobs.from(fileA)), fileAString);
168168

169169
// Verifies layer with fileB was added.
170-
TarArchiveEntry headerFileBLayer = tarArchiveInputStream.getNextTarEntry();
170+
TarArchiveEntry headerFileBLayer = tarArchiveInputStream.getNextEntry();
171171
Assert.assertEquals("blobs/sha256/" + fakeDigestB.getHash(), headerFileBLayer.getName());
172172
String fileBString =
173173
CharStreams.toString(
174174
new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8));
175175
Assert.assertEquals(Blobs.writeToString(Blobs.from(fileB)), fileBString);
176176

177177
// Verifies container configuration was added.
178-
TarArchiveEntry headerContainerConfiguration = tarArchiveInputStream.getNextTarEntry();
178+
TarArchiveEntry headerContainerConfiguration = tarArchiveInputStream.getNextEntry();
179179
Assert.assertEquals(
180180
"blobs/sha256/011212cff4d5d6b18c7d3a00a7a2701514a1fdd3ec0d250a03756f84f3d955d4",
181181
headerContainerConfiguration.getName());
182182
JsonTemplateMapper.readJson(tarArchiveInputStream, ContainerConfigurationTemplate.class);
183183

184184
// Verifies manifest was added.
185-
TarArchiveEntry headerManifest = tarArchiveInputStream.getNextTarEntry();
185+
TarArchiveEntry headerManifest = tarArchiveInputStream.getNextEntry();
186186
Assert.assertEquals(
187187
"blobs/sha256/1543d061159a8d6877087938bfd62681cdeff873e1fa3e1fcf12dec358c112a4",
188188
headerManifest.getName());
189189
JsonTemplateMapper.readJson(tarArchiveInputStream, OciManifestTemplate.class);
190190

191191
// Verifies oci-layout was added.
192-
TarArchiveEntry headerOciLayout = tarArchiveInputStream.getNextTarEntry();
192+
TarArchiveEntry headerOciLayout = tarArchiveInputStream.getNextEntry();
193193
Assert.assertEquals("oci-layout", headerOciLayout.getName());
194194
String ociLayoutJson =
195195
CharStreams.toString(
196196
new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8));
197197
Assert.assertEquals("{\"imageLayoutVersion\": \"1.0.0\"}", ociLayoutJson);
198198

199199
// Verifies index.json was added.
200-
TarArchiveEntry headerIndex = tarArchiveInputStream.getNextTarEntry();
200+
TarArchiveEntry headerIndex = tarArchiveInputStream.getNextEntry();
201201
Assert.assertEquals("index.json", headerIndex.getName());
202202
OciIndexTemplate index =
203203
JsonTemplateMapper.readJson(tarArchiveInputStream, OciIndexTemplate.class);

‎jib-core/src/test/java/com/google/cloud/tools/jib/image/ReproducibleLayerBuilderTest.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ReproducibleLayerBuilderTest {
5959
private static void verifyNextTarArchiveEntry(
6060
TarArchiveInputStream tarArchiveInputStream, String expectedExtractionPath, Path expectedFile)
6161
throws IOException {
62-
TarArchiveEntry header = tarArchiveInputStream.getNextTarEntry();
62+
TarArchiveEntry header = tarArchiveInputStream.getNextEntry();
6363
assertThat(header.getName()).isEqualTo(expectedExtractionPath);
6464

6565
byte[] expectedBytes = Files.readAllBytes(expectedFile);
@@ -78,7 +78,7 @@ private static void verifyNextTarArchiveEntry(
7878
private static void verifyNextTarArchiveEntryIsDirectory(
7979
TarArchiveInputStream tarArchiveInputStream, String expectedExtractionPath)
8080
throws IOException {
81-
TarArchiveEntry extractionPathEntry = tarArchiveInputStream.getNextTarEntry();
81+
TarArchiveEntry extractionPathEntry = tarArchiveInputStream.getNextEntry();
8282
assertThat(extractionPathEntry.getName()).isEqualTo(expectedExtractionPath);
8383
assertThat(extractionPathEntry.isDirectory()).isTrue();
8484
assertThat(extractionPathEntry.getMode()).isEqualTo(TarArchiveEntry.DEFAULT_DIR_MODE);
@@ -234,7 +234,7 @@ public void testBuild_parentDirBehavior() throws IOException {
234234

235235
try (TarArchiveInputStream in = new TarArchiveInputStream(Files.newInputStream(tarFile))) {
236236
// root (default folder permissions)
237-
TarArchiveEntry root = in.getNextTarEntry();
237+
TarArchiveEntry root = in.getNextEntry();
238238
assertThat(root.getMode()).isEqualTo(040755);
239239
assertThat(root.getModTime().toInstant()).isEqualTo(Instant.ofEpochSecond(1));
240240
assertThat(root.getLongUserId()).isEqualTo(0);
@@ -243,7 +243,7 @@ public void testBuild_parentDirBehavior() throws IOException {
243243
assertThat(root.getGroupName()).isEmpty();
244244

245245
// parentAAA (custom permissions, custom timestamp)
246-
TarArchiveEntry rootParentA = in.getNextTarEntry();
246+
TarArchiveEntry rootParentA = in.getNextEntry();
247247
assertThat(rootParentA.getMode()).isEqualTo(040111);
248248
assertThat(rootParentA.getModTime().toInstant()).isEqualTo(Instant.ofEpochSecond(10));
249249
assertThat(rootParentA.getLongUserId()).isEqualTo(0);
@@ -252,10 +252,10 @@ public void testBuild_parentDirBehavior() throws IOException {
252252
assertThat(rootParentA.getGroupName()).isEmpty();
253253

254254
// skip over fileA
255-
in.getNextTarEntry();
255+
in.getNextEntry();
256256

257257
// parentBBB (default permissions - ignored custom permissions, since fileB added first)
258-
TarArchiveEntry rootParentB = in.getNextTarEntry();
258+
TarArchiveEntry rootParentB = in.getNextEntry();
259259
// TODO (#1650): we want 040444 here.
260260
assertThat(rootParentB.getMode()).isEqualTo(040755);
261261
// TODO (#1650): we want Instant.ofEpochSecond(40) here.
@@ -266,10 +266,10 @@ public void testBuild_parentDirBehavior() throws IOException {
266266
assertThat(rootParentB.getGroupName()).isEmpty();
267267

268268
// skip over fileB
269-
in.getNextTarEntry();
269+
in.getNextEntry();
270270

271271
// parentCCC (default permissions - no entry provided)
272-
TarArchiveEntry rootParentC = in.getNextTarEntry();
272+
TarArchiveEntry rootParentC = in.getNextEntry();
273273
assertThat(rootParentC.getMode()).isEqualTo(040755);
274274
assertThat(rootParentC.getModTime().toInstant()).isEqualTo(Instant.ofEpochSecond(1));
275275
assertThat(rootParentC.getLongUserId()).isEqualTo(0);
@@ -358,13 +358,13 @@ public void testBuild_permissions() throws IOException {
358358

359359
try (TarArchiveInputStream in = new TarArchiveInputStream(Files.newInputStream(tarFile))) {
360360
// Root folder (default folder permissions)
361-
assertThat(in.getNextTarEntry().getMode()).isEqualTo(040755);
361+
assertThat(in.getNextEntry().getMode()).isEqualTo(040755);
362362
// fileA (default file permissions)
363-
assertThat(in.getNextTarEntry().getMode()).isEqualTo(0100644);
363+
assertThat(in.getNextEntry().getMode()).isEqualTo(0100644);
364364
// fileB (custom file permissions)
365-
assertThat(in.getNextTarEntry().getMode()).isEqualTo(0100123);
365+
assertThat(in.getNextEntry().getMode()).isEqualTo(0100123);
366366
// folder (custom folder permissions)
367-
assertThat(in.getNextTarEntry().getMode()).isEqualTo(040456);
367+
assertThat(in.getNextEntry().getMode()).isEqualTo(040456);
368368
}
369369
}
370370

@@ -433,55 +433,55 @@ public void testBuild_ownership() throws IOException {
433433
}
434434

435435
try (TarArchiveInputStream in = new TarArchiveInputStream(Files.newInputStream(tarFile))) {
436-
TarArchiveEntry entry1 = in.getNextTarEntry();
436+
TarArchiveEntry entry1 = in.getNextEntry();
437437
assertThat(entry1.getLongUserId()).isEqualTo(0);
438438
assertThat(entry1.getLongGroupId()).isEqualTo(0);
439439
assertThat(entry1.getUserName()).isEmpty();
440440
assertThat(entry1.getGroupName()).isEmpty();
441441

442-
TarArchiveEntry entry2 = in.getNextTarEntry();
442+
TarArchiveEntry entry2 = in.getNextEntry();
443443
assertThat(entry2.getLongUserId()).isEqualTo(0);
444444
assertThat(entry2.getLongGroupId()).isEqualTo(0);
445445
assertThat(entry2.getUserName()).isEmpty();
446446
assertThat(entry2.getGroupName()).isEmpty();
447447

448-
TarArchiveEntry entry3 = in.getNextTarEntry();
448+
TarArchiveEntry entry3 = in.getNextEntry();
449449
assertThat(entry3.getLongUserId()).isEqualTo(0);
450450
assertThat(entry3.getLongGroupId()).isEqualTo(0);
451451
assertThat(entry3.getUserName()).isEmpty();
452452
assertThat(entry3.getGroupName()).isEmpty();
453453

454-
TarArchiveEntry entry4 = in.getNextTarEntry();
454+
TarArchiveEntry entry4 = in.getNextEntry();
455455
assertThat(entry4.getLongUserId()).isEqualTo(333);
456456
assertThat(entry4.getLongGroupId()).isEqualTo(0);
457457
assertThat(entry4.getUserName()).isEmpty();
458458
assertThat(entry4.getGroupName()).isEmpty();
459459

460-
TarArchiveEntry entry5 = in.getNextTarEntry();
460+
TarArchiveEntry entry5 = in.getNextEntry();
461461
assertThat(entry5.getLongUserId()).isEqualTo(0);
462462
assertThat(entry5.getLongGroupId()).isEqualTo(555);
463463
assertThat(entry5.getUserName()).isEmpty();
464464
assertThat(entry5.getGroupName()).isEmpty();
465465

466-
TarArchiveEntry entry6 = in.getNextTarEntry();
466+
TarArchiveEntry entry6 = in.getNextEntry();
467467
assertThat(entry6.getLongUserId()).isEqualTo(333);
468468
assertThat(entry6.getLongGroupId()).isEqualTo(555);
469469
assertThat(entry6.getUserName()).isEmpty();
470470
assertThat(entry6.getGroupName()).isEmpty();
471471

472-
TarArchiveEntry entry7 = in.getNextTarEntry();
472+
TarArchiveEntry entry7 = in.getNextEntry();
473473
assertThat(entry7.getLongUserId()).isEqualTo(0);
474474
assertThat(entry7.getLongGroupId()).isEqualTo(0);
475475
assertThat(entry7.getUserName()).isEqualTo("user");
476476
assertThat(entry7.getGroupName()).isEmpty();
477477

478-
TarArchiveEntry entry8 = in.getNextTarEntry();
478+
TarArchiveEntry entry8 = in.getNextEntry();
479479
assertThat(entry8.getLongUserId()).isEqualTo(0);
480480
assertThat(entry8.getLongGroupId()).isEqualTo(0);
481481
assertThat(entry8.getUserName()).isEmpty();
482482
assertThat(entry8.getGroupName()).isEqualTo("group");
483483

484-
TarArchiveEntry entry9 = in.getNextTarEntry();
484+
TarArchiveEntry entry9 = in.getNextEntry();
485485
assertThat(entry9.getLongUserId()).isEqualTo(0);
486486
assertThat(entry9.getLongGroupId()).isEqualTo(0);
487487
assertThat(entry9.getUserName()).isEqualTo("user");

‎jib-core/src/test/java/com/google/cloud/tools/jib/tar/TarStreamBuilderTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,22 +118,22 @@ public void testToBlob_multiByte() throws IOException {
118118
TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(tarByteInputStream);
119119

120120
// Verify multi-byte characters are written/read correctly
121-
TarArchiveEntry headerFile = tarArchiveInputStream.getNextTarEntry();
121+
TarArchiveEntry headerFile = tarArchiveInputStream.getNextEntry();
122122
Assert.assertEquals("test", headerFile.getName());
123123
Assert.assertEquals(
124124
"日本語", new String(ByteStreams.toByteArray(tarArchiveInputStream), StandardCharsets.UTF_8));
125125

126-
headerFile = tarArchiveInputStream.getNextTarEntry();
126+
headerFile = tarArchiveInputStream.getNextEntry();
127127
Assert.assertEquals("crepecake", headerFile.getName());
128128
Assert.assertEquals(
129129
"asdf", new String(ByteStreams.toByteArray(tarArchiveInputStream), StandardCharsets.UTF_8));
130130

131-
headerFile = tarArchiveInputStream.getNextTarEntry();
131+
headerFile = tarArchiveInputStream.getNextEntry();
132132
Assert.assertEquals("jib", headerFile.getName());
133133
Assert.assertEquals(
134134
"jib", new String(ByteStreams.toByteArray(tarArchiveInputStream), StandardCharsets.UTF_8));
135135

136-
Assert.assertNull(tarArchiveInputStream.getNextTarEntry());
136+
Assert.assertNull(tarArchiveInputStream.getNextEntry());
137137
}
138138

139139
@Test
@@ -151,8 +151,8 @@ public void testToBlob_modificationTime() throws IOException {
151151

152152
TarArchiveInputStream tarInStream =
153153
new TarArchiveInputStream(new ByteArrayInputStream(outStream.toByteArray()));
154-
TarArchiveEntry entry1 = tarInStream.getNextTarEntry();
155-
TarArchiveEntry entry2 = tarInStream.getNextTarEntry();
154+
TarArchiveEntry entry1 = tarInStream.getNextEntry();
155+
TarArchiveEntry entry2 = tarInStream.getNextEntry();
156156

157157
assertThat(entry1.getName()).isEqualTo("foo");
158158
assertThat(entry1.getModTime().toInstant()).isEqualTo(Instant.ofEpochSecond(1234));
@@ -231,29 +231,29 @@ private void verifyBlobWithoutCompression() throws IOException {
231231
*/
232232
private void verifyTarArchive(TarArchiveInputStream tarArchiveInputStream) throws IOException {
233233
// Verifies fileA was archived correctly.
234-
TarArchiveEntry headerFileA = tarArchiveInputStream.getNextTarEntry();
234+
TarArchiveEntry headerFileA = tarArchiveInputStream.getNextEntry();
235235
Assert.assertEquals("some/path/to/resourceFileA", headerFileA.getName());
236236
byte[] fileAString = ByteStreams.toByteArray(tarArchiveInputStream);
237237
Assert.assertArrayEquals(fileAContents, fileAString);
238238

239239
// Verifies fileB was archived correctly.
240-
TarArchiveEntry headerFileB = tarArchiveInputStream.getNextTarEntry();
240+
TarArchiveEntry headerFileB = tarArchiveInputStream.getNextEntry();
241241
Assert.assertEquals("crepecake", headerFileB.getName());
242242
byte[] fileBString = ByteStreams.toByteArray(tarArchiveInputStream);
243243
Assert.assertArrayEquals(fileBContents, fileBString);
244244

245245
// Verifies directoryA was archived correctly.
246-
TarArchiveEntry headerDirectoryA = tarArchiveInputStream.getNextTarEntry();
246+
TarArchiveEntry headerDirectoryA = tarArchiveInputStream.getNextEntry();
247247
Assert.assertEquals("some/path/to/", headerDirectoryA.getName());
248248

249249
// Verifies the long file was archived correctly.
250-
TarArchiveEntry headerFileALong = tarArchiveInputStream.getNextTarEntry();
250+
TarArchiveEntry headerFileALong = tarArchiveInputStream.getNextEntry();
251251
Assert.assertEquals(
252252
"some/really/long/path/that/exceeds/100/characters/abcdefghijklmnopqrstuvwxyz0123456789012345678901234567890",
253253
headerFileALong.getName());
254254
byte[] fileALongString = ByteStreams.toByteArray(tarArchiveInputStream);
255255
Assert.assertArrayEquals(fileAContents, fileALongString);
256256

257-
Assert.assertNull(tarArchiveInputStream.getNextTarEntry());
257+
Assert.assertNull(tarArchiveInputStream.getNextEntry());
258258
}
259259
}

‎jib-gradle-plugin/src/integration-test/java/com/google/cloud/tools/jib/gradle/GradleLayerConfigurationIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ private List<List<String>> getLayers(Path tar) throws IOException {
169169

170170
try (TarArchiveInputStream image = new TarArchiveInputStream(Files.newInputStream(tar))) {
171171
TarArchiveEntry entry;
172-
while ((entry = image.getNextTarEntry()) != null) {
172+
while ((entry = image.getNextEntry()) != null) {
173173
if (entry.getName().endsWith(".tar.gz")) {
174174
@SuppressWarnings("resource") // must not close sub-streams
175175
TarArchiveInputStream layer = new TarArchiveInputStream(new GZIPInputStream(image));
176176
TarArchiveEntry layerEntry;
177177
List<String> layerFiles = new ArrayList<>();
178-
while ((layerEntry = layer.getNextTarEntry()) != null) {
178+
while ((layerEntry = layer.getNextEntry()) != null) {
179179
layerFiles.add(layerEntry.getName());
180180
}
181181
layers.add(0, layerFiles);

0 commit comments

Comments
 (0)