From a8c166ff016d0d3741ccd86619e2dae3bc8830ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Wed, 6 Jun 2012 09:54:17 +0800
Subject: [PATCH] bug fixed for reference

---
 .../fastjson/parser/DefaultJSONParser.java        | 15 ++++++++++-----
 .../deserializer/DefaultObjectDeserializer.java   |  5 +++++
 .../alibaba/json/bvt/bug/Bug_for_smoothrat7.java  |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java b/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
index 3960e0e09..e92eb0c1f 100644
--- a/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
+++ b/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
@@ -17,6 +17,7 @@ package com.alibaba.fastjson.parser;
 
 import static com.alibaba.fastjson.parser.JSONScanner.EOI;
 import static com.alibaba.fastjson.parser.JSONToken.EOF;
+import static com.alibaba.fastjson.parser.JSONToken.ERROR;
 import static com.alibaba.fastjson.parser.JSONToken.FALSE;
 import static com.alibaba.fastjson.parser.JSONToken.LBRACE;
 import static com.alibaba.fastjson.parser.JSONToken.LBRACKET;
@@ -29,7 +30,6 @@ import static com.alibaba.fastjson.parser.JSONToken.RBRACKET;
 import static com.alibaba.fastjson.parser.JSONToken.SET;
 import static com.alibaba.fastjson.parser.JSONToken.TREE_SET;
 import static com.alibaba.fastjson.parser.JSONToken.TRUE;
-import static com.alibaba.fastjson.parser.JSONToken.ERROR;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -279,14 +279,14 @@ public class DefaultJSONParser extends AbstractJSONParser {
 
                     this.setResolveStatus(TypeNameRedirect);
 
-                    if (this.context != null && fieldName instanceof String) {
+                    if (this.context != null && !(fieldName instanceof Integer)) {
                         this.popContext();
                     }
 
                     ObjectDeserializer deserializer = config.getDeserializer(clazz);
                     return deserializer.deserialze(this, clazz, fieldName);
                 }
-
+                
                 if (key == "$ref") {
                     lexer.nextToken(JSONToken.LITERAL_STRING);
                     if (lexer.token() == JSONToken.LITERAL_STRING) {
@@ -333,6 +333,8 @@ public class DefaultJSONParser extends AbstractJSONParser {
                         throw new JSONException("illegal ref, " + JSONToken.name(lexer.token()));
                     }
                 }
+                
+                setContext(object, fieldName);
 
                 Object value;
                 if (ch == '"') {
@@ -360,7 +362,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
                 } else if (ch == '[') { // 减少潜套，兼容android
                     lexer.nextToken();
                     JSONArray list = new JSONArray();
-                    this.parseArray(list);
+                    this.parseArray(list, key);
                     value = list;
                     object.put(key, value);
 
@@ -834,6 +836,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
 
         lexer.nextToken(JSONToken.LITERAL_STRING);
 
+        ParseContext context = this.getContext();
         this.setContext(array, fieldName);
         try {
             for (int i = 0;; ++i) {
@@ -912,7 +915,7 @@ public class DefaultJSONParser extends AbstractJSONParser {
                 }
             }
         } finally {
-            this.popContext();
+            this.setContext(context);
         }
     }
 
@@ -945,6 +948,8 @@ public class DefaultJSONParser extends AbstractJSONParser {
         }
 
         this.context = this.context.getParentContext();
+        contextArray[contextArrayIndex - 1] = null;
+        contextArrayIndex--;
     }
 
     public ParseContext setContext(Object object, Object fieldName) {
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/DefaultObjectDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/DefaultObjectDeserializer.java
index 396eb8e31..028810a43 100644
--- a/src/main/java/com/alibaba/fastjson/parser/deserializer/DefaultObjectDeserializer.java
+++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/DefaultObjectDeserializer.java
@@ -221,6 +221,11 @@ public class DefaultObjectDeserializer implements ObjectDeserializer {
                     lexer.nextToken(JSONToken.COMMA);
 
                     parser.setResolveStatus(DefaultJSONParser.TypeNameRedirect);
+                    
+                    if (context != null && !(fieldName instanceof Integer)) {
+                        parser.popContext();
+                    }
+                    
                     return (Map) deserializer.deserialze(parser, clazz, fieldName);
                 }
                 
diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java
index f5e8d235e..c7258e1f2 100644
--- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java
+++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java
@@ -23,7 +23,7 @@ public class Bug_for_smoothrat7 extends TestCase {
 
         Map<String, Object> entity2 = (Map<String, Object>) JSON.parse(text);
         Assert.assertEquals(map.getClass(), entity2.getClass());
-        Assert.assertEquals(true, entity2 == entity2.get("self"));
+        Assert.assertSame(entity2, entity2.get("self"));
     }