Skip to content

Log ignored IO exceptions #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 1 commit into from
Aug 8, 2024
Merged

Log ignored IO exceptions #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ class ShadowCopyAction implements CopyAction {
} catch(Throwable t) {
try {
resource.close()
} catch (IOException ignored) {
// Ignored
} catch (IOException e) {
log.warn("Could not close resource $resource", e)
}
throw UncheckedException.throwAsUncheckedException(t)
}
Expand Down
5 changes: 4 additions & 1 deletion ...om/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package com.github.jengelman.gradle.plugins.shadow.transformers

import groovy.util.logging.Slf4j
import org.apache.tools.zip.ZipEntry
import org.apache.tools.zip.ZipOutputStream
import org.codehaus.plexus.util.IOUtil
Expand All @@ -36,6 +37,7 @@ import static java.util.jar.JarFile.MANIFEST_NAME
* Modified from {@link ManifestResourceTransformer}.
* @author Chris Rankin
*/
@Slf4j
class ManifestAppenderTransformer implements Transformer {
private static final byte[] EOL = "\r\n".getBytes(UTF_8)
private static final byte[] SEPARATOR = ": ".getBytes(UTF_8)
Expand All @@ -62,7 +64,8 @@ class ManifestAppenderTransformer implements Transformer {
manifestContents = IOUtil.toByteArray(context.is)
try {
context.is
} catch (IOException ignored) {
} catch (IOException e) {
log.warn("Failed to read MANIFEST.MF", e)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion ...om/github/jengelman/gradle/plugins/shadow/transformers/ManifestResourceTransformer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package com.github.jengelman.gradle.plugins.shadow.transformers

import groovy.util.logging.Slf4j
import org.apache.tools.zip.ZipEntry
import org.apache.tools.zip.ZipOutputStream
import org.gradle.api.file.FileTreeElement
Expand All @@ -39,6 +40,7 @@ import java.util.jar.Manifest
* @author Jason van Zyl
* @author John Engelman
*/
@Slf4j
class ManifestResourceTransformer implements Transformer {

// Configuration
Expand Down Expand Up @@ -73,7 +75,8 @@ class ManifestResourceTransformer implements Transformer {
manifestDiscovered = true
try {
context.is
} catch (IOException ignored) {
} catch (IOException e) {
log.warn("Failed to read MANIFEST.MF", e)
}
}
}
Expand Down