Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"

2013-02-27 00:41:11 +00:00 · 2013-02-27 00:41:11 +00:00 · 64c34122f2
parent 16cbc30ae5 f170f145af
commit 64c34122f2
1 changed files with 5 additions and 9 deletions
--- a/java/src/com/android/inputmethod/research/ResearchLog.java
+++ b/java/src/com/android/inputmethod/research/ResearchLog.java
@ -107,17 +107,13 @@ public class ResearchLog {
                try {
                    if (mHasWrittenData) {
                        mJsonWriter.endArray();
+                        mHasWrittenData = false;
+                    }
                    mJsonWriter.flush();
                    mJsonWriter.close();
                    if (DEBUG) {
                        Log.d(TAG, "wrote log to " + mFile);
                    }
-                        mHasWrittenData = false;
-                    } else {
-                        if (DEBUG) {
-                            Log.d(TAG, "close() called, but no data, not outputting");
-                        }
-                    }
                } catch (Exception e) {
                    Log.d(TAG, "error when closing ResearchLog:", e);
                } finally {