wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1077590 - Part 0: minor sanity fixes in FennecNativeDriver. r=gbrown

Browse Source
This commit is contained in:
Richard Newman 2015-01-11 17:18:14 -08:00
parent 0fa8969731
commit ae4e88a49b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/mobile/robocop/FennecNativeDriver.java
View File

@ -287,11 +287,13 @@ public class FennecNativeDriver implements Driver {
log(LogLevel.ERROR, e);
} finally {
try {
br.close();
if (br != null) {
br.close();
}
} catch (IOException e) {
}
}
return text.toString();
return text.toString();
}
/**
@ -349,7 +351,7 @@ public class FennecNativeDriver implements Driver {
public static void log(LogLevel level, String message, Throwable t) {
if (mLogFile == null) {
assert(false);
throw new RuntimeException("No log file specified!");
}
if (level.isEnabled(mLogLevel)) {
@ -365,11 +367,14 @@ public class FennecNativeDriver implements Driver {
} catch (IOException ioe) {
Log.e("Robocop", "exception with file writer on: " + mLogFile);
} finally {
pw.close();
if (pw != null) {
pw.close();
}
}
// PrintWriter doesn't throw IOE but sets an error flag instead,
// so check for that
if (pw.checkError()) {
if (pw != null && pw.checkError()) {
Log.e("Robocop", "exception with file writer on: " + mLogFile);
}
}