infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-09 01:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

8067964: Native2ascii doesn't close one of the streams it opens

Browse Source 
Change sun.tools.native2ascii.Main.convert() to use try-with-resources; also clean up code formatting.

Reviewed-by: chegar
This commit is contained in:
Brian Burkhalter 2014-12-23 12:40:06 -08:00
parent 45a55f064e
commit 89ee032790
2 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java
View File

@ -71,11 +71,8 @@ import java.text.MessageFormat;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
import java.nio.file.Files;
import java.io.UnsupportedEncodingException;
import java.nio.charset.UnsupportedCharsetException;
import sun.tools.native2ascii.A2NFilter;
import sun.tools.native2ascii.N2AFilter;
/**
* Main program of the native2ascii
@ -94,7 +91,7 @@ public class Main {
/**
* Run the converter
*/
public synchronized boolean convert(String argv[]){
public synchronized boolean convert(String argv[]) {
List<String> v = new ArrayList<>(2);
File outputFile = null;
boolean createOutputFile = false;
@ -102,14 +99,14 @@ public class Main {
// Parse arguments
for (int i = 0; i < argv.length; i++) {
if (argv[i].equals("-encoding")) {
if ((i + 1) < argv.length){
if ((i + 1) < argv.length) {
encodingString = argv[++i];
} else {
error(getMsg("err.bad.arg"));
usage();
return false;
}
} else if (argv[i].equals("-reverse")){
} else if (argv[i].equals("-reverse")) {
reverse = true;
} else {
if (v.size() > 1) {
@ -119,15 +116,18 @@ public class Main {
v.add(argv[i]);
}
}
if (encodingString == null)
defaultEncoding = Charset.defaultCharset().name();
if (encodingString == null) {
defaultEncoding = Charset.defaultCharset().name();
}
char[] lineBreak = System.getProperty("line.separator").toCharArray();
try {
initializeConverter();
if (v.size() == 1)
if (v.size() == 1) {
inputFileName = v.get(0);
}
if (v.size() == 2) {
inputFileName = v.get(0);
@ -137,40 +137,38 @@ public class Main {
if (createOutputFile) {
outputFile = new File(outputFileName);
if (outputFile.exists() && !outputFile.canWrite()) {
throw new Exception(formatMsg("err.cannot.write", outputFileName));
}
if (outputFile.exists() && !outputFile.canWrite()) {
throw new Exception(formatMsg("err.cannot.write", outputFileName));
}
}
if (reverse){
BufferedReader reader = getA2NInput(inputFileName);
Writer osw = getA2NOutput(outputFileName);
String line;
while ((line = reader.readLine()) != null) {
osw.write(line.toCharArray());
osw.write(lineBreak);
if (outputFileName == null) { // flush stdout
osw.flush();
if (reverse) {
try (BufferedReader reader = getA2NInput(inputFileName);
Writer osw = getA2NOutput(outputFileName);) {
String line;
while ((line = reader.readLine()) != null) {
osw.write(line.toCharArray());
osw.write(lineBreak);
if (outputFileName == null) { // flush stdout
osw.flush();
}
}
}
reader.close(); // Close the stream.
osw.close();
} else {
//N2A
String inLine;
BufferedReader in = getN2AInput(inputFileName);
BufferedWriter out = getN2AOutput(outputFileName);
while ((inLine = in.readLine()) != null) {
out.write(inLine.toCharArray());
out.write(lineBreak);
if (outputFileName == null) { // flush stdout
out.flush();
// N2A
try (BufferedReader in = getN2AInput(inputFileName);
BufferedWriter out = getN2AOutput(outputFileName);) {
String inLine;
while ((inLine = in.readLine()) != null) {
out.write(inLine.toCharArray());
out.write(lineBreak);
if (outputFileName == null) { // flush stdout
out.flush();
}
}
}
out.close();
}
// Since we are done rename temporary file to desired output file
if (createOutputFile) {
if (outputFile.exists()) {
@ -182,8 +180,7 @@ public class Main {
}
tempFile.renameTo(outputFile);
}
} catch(Exception e){
} catch (Exception e) {
error(e.toString());
return false;
}

2
jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh
View File

@ -24,7 +24,7 @@
#
# @test
# @bug 4630463 4630971 4636448 4701617 4721296 4710890 6247817 7021987
# @bug 4630463 4630971 4636448 4701617 4721296 4710890 6247817 7021987 8067964
# @summary Tests miscellaneous native2ascii bugfixes and regressions