Skip to content
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.

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

Fix inadvertent closing of System.out when printing configuration #366

Merged
merged 5 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion base/src/main/java/proguard/ConfigurationWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class ConfigurationWriter implements AutoCloseable


private final PrintWriter writer;
private File configurationFile;
private File baseDir;


Expand All @@ -60,6 +61,7 @@ public ConfigurationWriter(File configurationFile) throws IOException
{
this(PrintWriterUtil.createPrintWriterOut(configurationFile));

this.configurationFile = configurationFile;
baseDir = configurationFile.getParentFile();
}

Expand All @@ -79,7 +81,7 @@ public ConfigurationWriter(PrintWriter writer) throws IOException
@Override
public void close() throws IOException
{
PrintWriterUtil.closePrintWriter(baseDir, writer);
PrintWriterUtil.closePrintWriter(configurationFile, writer);
}


Expand Down
5 changes: 1 addition & 4 deletions base/src/main/java/proguard/ProGuard.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import proguard.util.ConstantMatcher;
import proguard.util.ListParser;
import proguard.util.NameParser;
import proguard.util.PrintWriterUtil;
import proguard.util.StringMatcher;
import proguard.util.kotlin.KotlinUnsupportedVersionChecker;
import proguard.util.kotlin.asserter.KotlinMetadataVerifier;
Expand Down Expand Up @@ -297,9 +296,7 @@ private boolean requiresKotlinMetadata()
*/
private void printConfiguration() throws IOException
{
PrintWriter pw = PrintWriterUtil.createPrintWriterOut(configuration.printConfiguration);

try (ConfigurationWriter configurationWriter = new ConfigurationWriter(pw))
try (ConfigurationWriter configurationWriter = new ConfigurationWriter(configuration.printConfiguration))
{
configurationWriter.write(configuration);
}
Expand Down
6 changes: 6 additions & 0 deletions docs/md/manual/releasenotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Version 7.4.1

### Bugfixes

- Fix inadvertent closing of System.out when printing configuration. (#365)

## Version 7.4

### Java support
Expand Down
Loading