Commit Graph
361 Commits
Author SHA1 Message Date
温少 fba2f73681 support JSONType.orders 2012-05-22 09:41:49 +08:00
温少 db0261d46d Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
Conflicts:
	pom.xml
2012-05-15 10:40:40 +08:00
温少 16bbe5ac0d test use jackson 1.9.7 2012-05-15 10:31:13 +08:00
温少 6bffad43b2 test use jackson 1.9.3 2012-05-15 10:24:50 +08:00
温少 142d243fcd remove warnings && enhanced error information 2012-05-09 11:10:39 +08:00
温少 bde381c750 support builder's set 2012-05-03 10:07:05 +08:00
温少 082d88f648 Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git 2012-05-02 11:28:25 +08:00
温少 c692629d89 optimize encode 2012-05-02 11:27:36 +08:00
温少 16047260fa Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git 2012-04-28 10:59:14 +08:00
温少 e8254bfcfe optimize encode 2012-04-28 10:58:47 +08:00
温少 f61939ba1f Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git 2012-04-27 13:49:40 +08:00
温少 ec0a4247e3 optimize encode 2012-04-27 13:49:29 +08:00
温少 5a2f7c9bf5 bug fixed for optimize 2012-04-27 00:56:37 +08:00
温少 f8a576fac2 Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git 2012-04-27 00:56:15 +08:00
温少 55afa54d13 1.1.19 2012-04-27 00:46:08 +08:00
温少 bd49960327 improve serialize performance 2012-04-27 00:41:59 +08:00
温少 5dc8e8b7c0 optimize encode 2012-04-26 22:18:13 +08:00
温少 51c207133c Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git 2012-04-26 10:02:46 +08:00
axmanwang 2e86b725bd bug fixed for List Serialize 2012-04-26 10:02:37 +08:00
axmanwang 08eba4be2e modify the testCase 2012-04-26 09:52:02 +08:00
axmanwang 876f39d552 Merge branch 'master' of https://github.com/AlibabaTech/fastjson 2012-04-25 17:42:35 +08:00
温少 7899a5a917 Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
Conflicts:
	src/test/java/com/alibaba/json/bvt/bug/Bug_for_hmy8.java
	src/test/java/com/alibaba/json/bvtVO/IEventDto.java
2012-04-25 17:27:33 +08:00
温少 ad6d97a364 bug fixed for ArrayList Property 2012-04-25 17:26:29 +08:00
axmanwang 9e3489891b Merge branch 'master' of https://github.com/AlibabaTech/fastjson 2012-04-25 17:14:44 +08:00
温少 055aab783e 修正ArrayList对象返回值的bug。 2012-04-25 17:11:30 +08:00
axmanwang 8af135f30e optimize the hash function 2012-04-11 11:52:52 +08:00
温少 21e357a46a 1.1.18 2012-04-11 10:23:41 +08:00
axmanwang 510d474c2a plus the hash function 2012-04-10 16:28:23 +08:00
axmanwang 248c1072e0 plus the hash function 2012-04-10 14:59:37 +08:00
axmanwang 819ac81f46 refactor 2012-04-10 14:23:24 +08:00
axmanwang 18657bdec8 refactor the test file to AnticollisionHashMapTest.java 2012-04-10 14:16:15 +08:00
axmanwang 24fbe56190 add a default implementation of map as AnticollisionHashMap 2012-04-10 13:53:30 +08:00
温少 3cd168050a bug fixed for memory leak 2012-04-01 16:55:52 +08:00
温少 a687452c82 refactor test 2012-03-24 19:39:47 +08:00
温少 b2382c7c83 refactor 2012-03-24 10:00:33 +08:00
温少 77c72c8f7c 0.1.18-SNAPSHOT 2012-03-24 09:53:27 +08:00
温少 d653ec5192 bug fixed for linkedhashmap 2012-03-24 09:52:57 +08:00
温少 f84f865edc fastjson 1.1.17 2012-03-14 09:59:38 +08:00
温少 1134e5f7db add test 2012-03-14 09:59:11 +08:00
温少 c4b3c407f5 bug fixed for map reference 2012-03-14 02:18:20 +08:00
温少 fa7c17d934 add test 2012-03-12 22:05:56 +08:00
温少 1aaaec7d80 add test 2012-03-12 20:10:43 +08:00
温少 a384c27eb9 1.1.17 2012-03-12 17:31:16 +08:00
温少 d55a78db50 Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
Conflicts:
	pom.xml
	src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
	src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_9.java
2012-03-12 17:25:13 +08:00
温少 12d54d284e bug fixed for reference 2012-03-12 17:24:33 +08:00
温少 7f38646ce7 bug fixed & 1.1.16 2012-03-12 11:20:58 +08:00
温少 890c55ae19 bug fixed for date parse 2012-03-09 17:32:45 +08:00
温少 99328d96b4 Merge branch 'master' of https://wenshao@github.com/AlibabaTech/fastjson.git
Conflicts:
	src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java
2012-03-08 09:35:25 +08:00
温少 62c589a402 bug fixed for java.sql.Timestamp 2012-03-08 09:31:23 +08:00
温少 2c88690d0a bug fixed for java.sql.Timestamp 2012-03-08 09:15:02 +08:00