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

am 1f99e04b: Merge "Fix JsonWriter bug" 

* commit '1f99e04bba22c7c842a7e6d5581286142559ceb6':
  Fix JsonWriter bug
main
Kurt Partridge 2013-04-17 11:22:21 -07:00 committed by Android Git Automerger
parent 6c80e0475c 1f99e04bba
commit b20c7ee750
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,10 +108,14 @@ public class ResearchLog {
@Override
public Object call() throws Exception {
try {
if (mHasWrittenData) {
mJsonWriter.endArray();
mHasWrittenData = false;
// TODO: This is necessary to avoid an exception. Better would be to not even
// open the JsonWriter if the file is not even opened unless there is valid data
// to write.
if (!mHasWrittenData) {
mJsonWriter.beginArray();
}
mJsonWriter.endArray();
mHasWrittenData = false;
mJsonWriter.flush();
mJsonWriter.close();
if (DEBUG) {
@ -159,6 +163,12 @@ public class ResearchLog {
public Object call() throws Exception {
try {
if (mHasWrittenData) {
// TODO: This is necessary to avoid an exception. Better would be to not
// even open the JsonWriter if the file is not even opened unless there is
// valid data to write.
if (!mHasWrittenData) {
mJsonWriter.beginArray();
}
mJsonWriter.endArray();
mJsonWriter.close();
mHasWrittenData = false;