diff --git a/pom.xml b/pom.xml
index ec1222bf7..6b26bda82 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.alibaba
fastjson
- 1.1.36
+ 1.1.37-SNAPSHOT
jar
fastjson
diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java
index ea3afe761..17ed06663 100755
--- a/src/main/java/com/alibaba/fastjson/JSON.java
+++ b/src/main/java/com/alibaba/fastjson/JSON.java
@@ -259,6 +259,10 @@ public abstract class JSON implements JSONStreamAware, JSONAware {
for (int i = 0; i < size; ++i) {
ResolveTask task = resolveTaskList.get(i);
FieldDeserializer fieldDeser = task.getFieldDeserializer();
+
+ if (fieldDeser == null) {
+ continue;
+ }
Object object = null;
if (task.getOwnerContext() != null) {
@@ -698,5 +702,5 @@ public abstract class JSON implements JSONStreamAware, JSONAware {
return TypeUtils.cast(json, clazz, ParserConfig.getGlobalInstance());
}
- public final static String VERSION = "1.1.35";
+ public final static String VERSION = "1.1.37";
}
diff --git a/src/main/java/com/alibaba/fastjson/serializer/PascalNameFilter.java b/src/main/java/com/alibaba/fastjson/serializer/PascalNameFilter.java
index fa0ae2054..624f368ba 100755
--- a/src/main/java/com/alibaba/fastjson/serializer/PascalNameFilter.java
+++ b/src/main/java/com/alibaba/fastjson/serializer/PascalNameFilter.java
@@ -7,11 +7,10 @@ public class PascalNameFilter implements NameFilter {
return name;
}
- char firstChar = name.charAt(0);
- char upperFirstChar = Character.toUpperCase(firstChar);
+ char[] chars = name.toCharArray();
+ chars[0]= Character.toUpperCase(chars[0]);
- String pascalName = upperFirstChar + name.substring(1);
+ String pascalName = new String(chars);
return pascalName;
}
-
}