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

1.1.17

Browse Source
This commit is contained in:
温少
2012-03-12 17:31:16 +08:00
parent d55a78db50
commit a384c27eb9
4 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
-4
View File
@@ -3,11 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<<<<<<< HEAD
<version>1.1.17-SNAPSHOT</version>
=======
<version>1.1.16</version>
>>>>>>> branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
<packaging>jar</packaging>
<name>fastjson</name>
src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
+3 -15
View File
@@ -302,8 +302,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
if (parentContext.getObject() != null) {
refValue = this.getContext().getObject();
} else {
MapResolveFieldDeserializer fieldResolver = new MapResolveFieldDeserializer(object, (String) key);
addResolveTask(new ResolveTask(parentContext, ref, parentContext, fieldResolver));
addResolveTask(new ResolveTask(parentContext, ref));
setResolveStatus(DefaultJSONParser.NeedToResolve);
}
} else if ("$".equals(ref)) {
@@ -319,8 +318,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
setResolveStatus(DefaultJSONParser.NeedToResolve);
}
} else {
MapResolveFieldDeserializer fieldResolver = new MapResolveFieldDeserializer(object, (String) key);
addResolveTask(new ResolveTask(context, ref, context.getParentContext(), fieldResolver));
addResolveTask(new ResolveTask(context, ref));
setResolveStatus(DefaultJSONParser.NeedToResolve);
}
@@ -377,7 +375,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
lexer.nextToken();
Object obj = this.parseObject(new JSONObject(), key);
checkMapResolve(object, key.toString());
object.put(key, obj);
setContext(context, obj, key);
@@ -1123,18 +1121,8 @@ public class DefaultJSONParser extends AbstractJSONParser {
private ParseContext ownerContext;
public ResolveTask(ParseContext context, String referenceValue){
<<<<<<< HEAD
=======
this(context, referenceValue, null, null);
}
public ResolveTask(ParseContext context, String referenceValue, ParseContext ownerContext,
FieldDeserializer fieldDeserializer){
>>>>>>> branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
this.context = context;
this.referenceValue = referenceValue;
this.ownerContext = ownerContext;
this.fieldDeserializer = fieldDeserializer;
}
public ParseContext getContext() {
src/main/java/com/alibaba/fastjson/parser/deserializer/DateFormatDeserializer.java
+1
View File
@@ -11,6 +11,7 @@ public class DateFormatDeserializer extends AbstractDateDeserializer implements
public final static DateFormatDeserializer instance = new DateFormatDeserializer();
@SuppressWarnings("unchecked")
protected <T> T cast(DefaultJSONParser parser, Type clazz, Object fieldName, Object val) {
if (val instanceof String) {
src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_9.java
-3
View File
@@ -26,14 +26,11 @@ public class Bug_for_lenolix_9 extends TestCase {
System.out.println(mapString4);
Object object4 = JSON.parse(mapString4);
Assert.assertNotNull(object4);
<<<<<<< HEAD
Map<String, Object> map = (Map<String, Object>) object4;
Assert.assertNotNull(map.get("address1"));
Assert.assertNotNull(map.get("address2"));
=======
>>>>>>> branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
}