mirror of
https://github.com/Guardsquare/proguard.git
synced 2026-03-13 09:50:34 +08:00
Close file handle in ConfigurationWriter
This commit is contained in:
committed by
Jelle De Coninck
parent
836253f1da
commit
e76e47953f
@@ -51,7 +51,7 @@ public class ConfigurationWriter implements AutoCloseable
|
||||
|
||||
private final PrintWriter writer;
|
||||
private File configurationFile;
|
||||
private File baseDir;
|
||||
private String baseDirName;
|
||||
|
||||
|
||||
/**
|
||||
@@ -62,7 +62,10 @@ public class ConfigurationWriter implements AutoCloseable
|
||||
this(PrintWriterUtil.createPrintWriterOut(configurationFile));
|
||||
|
||||
this.configurationFile = configurationFile;
|
||||
baseDir = configurationFile.getParentFile();
|
||||
if (configurationFile.getParentFile() != null)
|
||||
{
|
||||
baseDirName = configurationFile.getParentFile().getAbsolutePath() + File.separator;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -801,13 +804,9 @@ public class ConfigurationWriter implements AutoCloseable
|
||||
String fileName = file.getAbsolutePath();
|
||||
|
||||
// See if we can convert the file name into a relative file name.
|
||||
if (baseDir != null)
|
||||
if (baseDirName != null && fileName.startsWith(baseDirName))
|
||||
{
|
||||
String baseDirName = baseDir.getAbsolutePath() + File.separator;
|
||||
if (fileName.startsWith(baseDirName))
|
||||
{
|
||||
fileName = fileName.substring(baseDirName.length());
|
||||
}
|
||||
fileName = fileName.substring(baseDirName.length());
|
||||
}
|
||||
|
||||
return quotedString(fileName);
|
||||
|
||||
Reference in New Issue
Block a user