nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "[TestPrep8] Narrow try/catch scope"

main
Kurt Partridge 2013-02-22 19:36:31 +00:00 committed by Android (Google) Code Review
parent c3252cfaf7 744b363ae8
commit b5c2033aa5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/research/ResearchLog.java
View File

@ -207,23 +207,22 @@ public class ResearchLog {
* called. The cached value is returned in future calls. * called. The cached value is returned in future calls.
*/ */
public JsonWriter getInitializedJsonWriterLocked() { public JsonWriter getInitializedJsonWriterLocked() {
if (mJsonWriter != NULL_JSON_WRITER || mFile == null) return mJsonWriter;
try { try {
if (mJsonWriter == NULL_JSON_WRITER && mFile != null) {
final JsonWriter jsonWriter = createJsonWriter(mContext, mFile); final JsonWriter jsonWriter = createJsonWriter(mContext, mFile);
if (jsonWriter != null) { if (jsonWriter != null) {
jsonWriter.beginArray(); jsonWriter.beginArray();
mJsonWriter = jsonWriter; mJsonWriter = jsonWriter;
mHasWrittenData = true; mHasWrittenData = true;
} }
} } catch (final IOException e) {
} catch (IOException e) {
Log.w(TAG, "Error in JsonWriter; disabling logging", e); Log.w(TAG, "Error in JsonWriter; disabling logging", e);
try { try {
mJsonWriter.close(); mJsonWriter.close();
} catch (IllegalStateException e1) { } catch (final IllegalStateException e1) {
// Assume that this is just the json not being terminated properly. // Assume that this is just the json not being terminated properly.
// Ignore // Ignore
} catch (IOException e1) { } catch (final IOException e1) {
Log.w(TAG, "Error in closing JsonWriter; disabling logging", e1); Log.w(TAG, "Error in closing JsonWriter; disabling logging", e1);
} finally { } finally {
mJsonWriter = NULL_JSON_WRITER; mJsonWriter = NULL_JSON_WRITER;