fixed null if statement violations

wenshao · wenshao · commit 82fb084541c6 · 2013-07-08T21:41:03.000+08:00
diff --git a/src/main/java/com/alibaba/fastjson/JSONReader.java b/src/main/java/com/alibaba/fastjson/JSONReader.java
@@ -94,27 +94,27 @@ private void endStructure() {
         context = context.getParent();
 
         if (context == null) {
-            // skip
-        } else {
-            final int state = context.getState();
-            int newState = -1;
-            switch (state) {
-                case PropertyKey:
-                    newState = PropertyValue;
-                    break;
-                case StartArray:
-                    newState = ArrayValue;
-                    break;
-                case PropertyValue:
-                case StartObject:
-                    newState = PropertyKey;
-                    break;
-                default:
-                    break;
-            }
-            if (newState != -1) {
-                context.setState(newState);
-            }
+            return;
+        }
+        
+        final int state = context.getState();
+        int newState = -1;
+        switch (state) {
+            case PropertyKey:
+                newState = PropertyValue;
+                break;
+            case StartArray:
+                newState = ArrayValue;
+                break;
+            case PropertyValue:
+            case StartObject:
+                newState = PropertyKey;
+                break;
+            default:
+                break;
+        }
+        if (newState != -1) {
+            context.setState(newState);
         }
     }
 
diff --git a/src/main/java/com/alibaba/fastjson/JSONWriter.java b/src/main/java/com/alibaba/fastjson/JSONWriter.java
@@ -98,25 +98,25 @@ private void endStructure() {
         context = context.getParent();
 
         if (context == null) {
-            // skip
-        } else {
-            final int state = context.getState();
-            int newState = -1;
-            switch (state) {
-                case PropertyKey:
-                    newState = PropertyValue;
-                    break;
-                case StartArray:
-                    newState = ArrayValue;
-                    break;
-                case ArrayValue:
-                    break;
-                default:
-                    break;
-            }
-            if (newState != -1) {
-                context.setState(newState);
-            }
+            return;
+        }
+        
+        final int state = context.getState();
+        int newState = -1;
+        switch (state) {
+            case PropertyKey:
+                newState = PropertyValue;
+                break;
+            case StartArray:
+                newState = ArrayValue;
+                break;
+            case ArrayValue:
+                break;
+            default:
+                break;
+        }
+        if (newState != -1) {
+            context.setState(newState);
         }
     }
 
@@ -143,7 +143,7 @@ private void afterWriter() {
         if (context == null) {
             return;
         }
-        
+
         final int state = context.getState();
         int newState = -1;
         switch (state) {
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/ASMDeserializerFactory.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/ASMDeserializerFactory.java
@@ -1124,8 +1124,10 @@ private void _init(ClassWriter cw, Context context) {
             }
 
             if (fieldClass.isEnum()) {
+                return;
+            }
 
-            } else if (Collection.class.isAssignableFrom(fieldClass)) {
+            if (Collection.class.isAssignableFrom(fieldClass)) {
                 FieldVisitor fw = cw.visitField(ACC_PUBLIC, fieldInfo.getName() + "_asm_list_item_deser__",
                                                 getDesc(ObjectDeserializer.class));
                 fw.visitEnd();
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/StackTraceElementDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/StackTraceElementDeserializer.java
@@ -90,15 +90,15 @@ public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName) {
                     throw new JSONException("syntax error");
                 }
             } else if (key == JSON.DEFAULT_TYPE_KEY) {
-                if (lexer.token() == JSONToken.NULL) {
-                    // skip
-                } else if (lexer.token() == JSONToken.LITERAL_STRING) {
+               if (lexer.token() == JSONToken.LITERAL_STRING) {
                     String elementType = lexer.stringVal();
                     if (!elementType.equals("java.lang.StackTraceElement")) {
                         throw new JSONException("syntax error : " + elementType);    
                     }
                 } else {
-                    throw new JSONException("syntax error");
+                    if (lexer.token() != JSONToken.NULL) {
+                        throw new JSONException("syntax error");
+                    }
                 }
             } else {
                 throw new JSONException("syntax error : " + key);
