GithubStar/fastjson
1
0
Fork 0
mirror of https://github.com/alibaba/fastjson.git synced 2026-10-28 13:50:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from pentiumao/master

Browse Source 
Fix Issue #40
This commit is contained in:
温高铁
2013-06-08 11:05:08 -07:00
parent c4c1da1eaf a444862b98
commit 72ecfb5f69
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
+7 -2
View File
@@ -360,6 +360,11 @@ public class DefaultJSONParser extends AbstractJSONParser {
if (!setContextFlag) {
setContext(object, fieldName);
setContextFlag = true;
// fix Issue #40
if (this.context != null && !(fieldName instanceof Integer)) {
this.popContext();
}
}
Object value;
@@ -389,7 +394,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
}
object.put(key, value);
} else if (ch == '[') { // 减少潜套，兼容android
} else if (ch == '[') { // 减少嵌套，兼容android
lexer.nextToken();
JSONArray list = new JSONArray();
this.parseArray(list, key);
@@ -404,7 +409,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
} else {
throw new JSONException("syntax error");
}
} else if (ch == '{') { // 减少潜套，兼容android
} else if (ch == '{') { // 减少嵌套，兼容android
lexer.nextToken();
Object obj = this.parseObject(new JSONObject(), key);
checkMapResolve(object, key.toString());