Commit Graph

3554 Commits

Author SHA1 Message Date
Zhang Si 9d9155fd77 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-24 22:41:28 +08:00
wenshao 17d1c1a5c4 bug fixed for jsonpath set 2020-05-24 22:37:53 +08:00
高铁 4855a2a085 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-23 20:31:23 +08:00
高铁 c485b677a2 update version 2020-05-23 20:30:56 +08:00
高铁 eef06dcc2a improved protobuf support 2020-05-23 20:30:43 +08:00
高铁 7c96cdc164 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-23 20:14:23 +08:00
高铁 102cd6ed11 improved kotlin emptySet support 2020-05-23 10:33:27 +08:00
高铁 526b956948 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-23 08:03:54 +08:00
高铁 e58dc07d6a improved kotlin emptySet support 2020-05-23 08:03:11 +08:00
高铁 bd77378351 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-23 00:39:16 +08:00
高铁 60092eb2fa improved kotlin emptyList support 2020-05-23 00:38:19 +08:00
高铁 6197a814d1 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-22 21:04:17 +08:00
高铁 c8c0005a1c bug fixed for toJavaObject 2020-05-22 21:02:38 +08:00
高铁 32ab90acfc 1.2.69 release 2 2020-05-17 23:25:02 +08:00
高铁 70eaae0eb5 bug fixed for scanFieldString & scanFieldSymbol 2020-05-17 14:21:48 +08:00
高铁 11af5f272a 1.2.69 release 1.2.69 2020-05-17 00:00:17 +08:00
高铁 9af851152e use hashcode64 2020-05-16 23:46:51 +08:00
温绍锦 dde6b99008 Merge pull request #3142 from J-Cod3r/fix-issue-3050
Fix issue 3050 属性Feature.InitStringFieldAsEmpty导致没有使用双引号的数值型value解析错误
2020-05-16 14:29:19 +08:00
高铁 8e22f7d7ef Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-15 23:32:49 +08:00
高铁 0394c3b140 update version 2020-05-15 23:32:31 +08:00
温绍锦 566950d2ec Merge pull request #3161 from kylixs/fix-encode-bytes-buf
fix #3160 save encode bytes buf to thread local
2020-05-15 21:02:08 +08:00
gongdewei 8d1d7ec064 add testcase for issue #3160 2020-05-15 20:55:23 +08:00
gongdewei 8078496978 添加检查SerializeWriter bytesBufLocal的单元测试 2020-05-15 19:53:36 +08:00
温绍锦 731cb6d082 Merge pull request #3163 from kylixs/serialize-writer-memory-optimizing
减少boolean类型字段值的内存碎片
2020-05-15 19:17:14 +08:00
gongdewei cc1d148511 修改boolean值常量为private类型 2020-05-15 19:15:32 +08:00
gongdewei d55701e429 format code 2020-05-15 19:10:06 +08:00
gongdewei 47ec01362f 减少boolean类型字段值的内存碎片 2020-05-15 19:05:36 +08:00
gongdewei d585b791b4 fix #3160 save encode bytes buf to thread local 2020-05-15 10:51:28 +08:00
yangy 0cb97f4a01 Merge remote-tracking branch 'upstream/master' into fix-issue-3050 2020-05-13 20:58:29 +08:00
温绍锦 ec83a6913c Merge pull request #3151 from ziqin/revoke-exec
Revoke unnecessary exec permission for text files
2020-05-13 13:20:13 +08:00
温绍锦 4b966ad93c Merge pull request #3152 from ArronHuang/master
fix typo and arrange package
2020-05-13 13:02:43 +08:00
温绍锦 e0a5751e13 Merge pull request #3154 from NyanGuyMF/hotfix/501-https-required
Fix: 501 HTTPS Required.
2020-05-13 13:01:55 +08:00
Vasiliy 94f22b743c Fix: 501 HTTPS Required.
501 HTTPS Required. 
Use https://repo1.maven.org/maven2/
More information at https://links.sonatype.com/central/501-https-required
2020-05-12 15:34:34 +05:00
yangy 0624524c4f Merge remote-tracking branch 'upstream/master' into fix-issue-3050 2020-05-11 11:32:41 +08:00
arronhuang 94b87e3405 fix typo and arrange package 2020-05-11 09:18:52 +08:00
温绍锦 a8e942f1ae Merge pull request #3148 from ArronHuang/master
issue 3083 bug fix and fix typo
2020-05-10 22:31:34 +08:00
J-Cod3r 1f846a35af Merge pull request #1 from alibaba/master
merge master
2020-05-10 13:54:35 +08:00
WANG Ziqin 19d9c189e2 Revoke unnecessary exec permission for text files
755 -> 644
2020-05-09 10:05:17 +08:00
arronhuang 3767427a0b remove diamond operator 2020-05-07 21:56:16 +08:00
arronhuang 3edc6ff1e9 issue 3083 bug fix and fix typo 2020-05-07 21:32:14 +08:00
温绍锦 e2cfb4f346 Merge pull request #3146 from ArronHuang/master
Fix issue 3132 包名为中文的时候toJSONString会有异常
2020-05-07 21:14:20 +08:00
高铁 ca2e75795d add blacklist 2020-05-07 20:45:56 +08:00
arronhuang abf06634a2 fix typo 2020-05-07 10:44:03 +08:00
arronhuang ee93a07842 issue 3132 bug fix 2020-05-06 20:30:01 +08:00
高铁 fc7ed72fa2 Merge branch 'master' of https://github.com/alibaba/fastjson 2020-05-05 21:50:58 +08:00
yangy 31e8496ebd fix issue 3050 & 2387 2020-05-05 20:41:15 +08:00
高铁 63d7ca61e0 JSONPath support chinese key, fix #2721 2020-05-05 14:30:15 +08:00
温绍锦 74e82bec54 Merge pull request #2974 from kimmking/issue2939
add testcase for #2939
2020-05-05 14:09:43 +08:00
温绍锦 267fe1b20d Merge pull request #3062 from Omega-Ariston/fix-issue3061
fixes #3061 SerializeConfig.getObjectWriter不为null时及时返回
2020-05-05 14:04:48 +08:00
温绍锦 4771a71000 Merge pull request #3144 from wen0909/master
fix issue #2065
2020-05-05 13:56:29 +08:00