Fix stream being close twice

gnodet · gnodet · commit 703f4fa01fc0 · 2024-11-26T20:50:43.000+01:00
The close method should be idemptotent, however, the JDK8 FilterOutputStream#close() method is not...
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -651,8 +651,10 @@ protected void close() throws IOException {
             if (zipArchiveOutputStream != null) {
                 if (zOut != null) {
                     zOut.writeTo(zipArchiveOutputStream);
+                } else {
+                    zipArchiveOutputStream.close();
                 }
-                zipArchiveOutputStream.close();
+                zipArchiveOutputStream = null;
             }
         } catch (IOException ex) {
             // If we're in this finally clause because of an

Original file line number	Diff line number	Diff line change
`@@ -651,8 +651,10 @@ protected void close() throws IOException {`
`651`	`651`	`if (zipArchiveOutputStream != null) {`
`652`	`652`	`if (zOut != null) {`
`653`	`653`	`zOut.writeTo(zipArchiveOutputStream);`
	`654`	`+ } else {`
	`655`	`+ zipArchiveOutputStream.close();`
`654`	`656`	`}`
`655`		`- zipArchiveOutputStream.close();`
	`657`	`+ zipArchiveOutputStream = null;`
`656`	`658`	`}`
`657`	`659`	`} catch (IOException ex) {`
`658`	`660`	`// If we're in this finally clause because of an`