Skip to content

Commit 641d940

Browse files
committed
fix dead loop
1 parent 89accda commit 641d940

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

APIJSONORM/src/main/java/apijson/JSON.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static String getCorrectJson(String s, boolean isArray) {
6464
* @param json
6565
* @return
6666
*/
67-
private static final Feature[] DEFAULT_FASTJSON_FEATURES = {Feature.OrderedField, Feature.AllowSingleQuotes, Feature.DisableCircularReferenceDetect, Feature.UseBigDecimal, Feature.UseObjectArray};
67+
private static final Feature[] DEFAULT_FASTJSON_FEATURES = {Feature.OrderedField, Feature.AllowSingleQuotes, Feature.UseBigDecimal, Feature.UseObjectArray};
6868
public static Object parse(Object obj) {
6969
int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
7070
features |= Feature.OrderedField.getMask();

APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@
55

66
package apijson.orm;
77

8-
import static apijson.JSONObject.KEY_COMBINE;
9-
import static apijson.JSONObject.KEY_DROP;
10-
import static apijson.JSONObject.KEY_TRY;
11-
import static apijson.RequestMethod.POST;
12-
import static apijson.RequestMethod.PUT;
13-
import static apijson.orm.SQLConfig.TYPE_ITEM;
8+
import apijson.JSONResponse;
9+
import apijson.Log;
10+
import apijson.NotNull;
11+
import apijson.RequestMethod;
12+
import apijson.StringUtil;
13+
import apijson.orm.AbstractFunctionParser.FunctionBean;
14+
import apijson.orm.exception.ConflictException;
15+
import apijson.orm.exception.NotExistException;
16+
import com.alibaba.fastjson.JSON;
17+
import com.alibaba.fastjson.JSONArray;
18+
import com.alibaba.fastjson.JSONObject;
1419

20+
import javax.activation.UnsupportedDataTypeException;
1521
import java.rmi.ServerException;
1622
import java.util.ArrayList;
1723
import java.util.Arrays;
@@ -22,20 +28,12 @@
2228
import java.util.Map.Entry;
2329
import java.util.Set;
2430

25-
import javax.activation.UnsupportedDataTypeException;
26-
27-
import com.alibaba.fastjson.JSON;
28-
import com.alibaba.fastjson.JSONArray;
29-
import com.alibaba.fastjson.JSONObject;
30-
31-
import apijson.JSONResponse;
32-
import apijson.Log;
33-
import apijson.NotNull;
34-
import apijson.RequestMethod;
35-
import apijson.StringUtil;
36-
import apijson.orm.AbstractFunctionParser.FunctionBean;
37-
import apijson.orm.exception.ConflictException;
38-
import apijson.orm.exception.NotExistException;
31+
import static apijson.JSONObject.KEY_COMBINE;
32+
import static apijson.JSONObject.KEY_DROP;
33+
import static apijson.JSONObject.KEY_TRY;
34+
import static apijson.RequestMethod.POST;
35+
import static apijson.RequestMethod.PUT;
36+
import static apijson.orm.SQLConfig.TYPE_ITEM;
3937

4038

4139
/**简化Parser,getObject和getArray(getArrayConfig)都能用
@@ -572,7 +570,7 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
572570
invalidate();
573571
}
574572
}
575-
Log.i(TAG, "onChildParse ObjectParser.onParse key = " + key + "; child = " + child);
573+
// Log.i(TAG, "onChildParse ObjectParser.onParse key = " + key + "; child = " + child);
576574

577575
return isEmpty ? null : child;//只添加! isChildEmpty的值,可能数据库返回数据不够count
578576
}

0 commit comments

Comments
 (0)