aboutsummaryrefslogtreecommitdiff
path: root/java/core/src/main/java/com
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-0471-5522/+4397
* Merge master branch.Feng Xiao2018-08-081-4/+12
|\
| * Store the class object itself (#4927)Jonathan Haber2018-07-231-4/+12
* | Down-integrate from google3.Feng Xiao2018-08-0819-191/+260
|/
* Remove unsafe no-copy String allocation since it's not useful in recent Java ...Anuraag Agrawal2018-05-112-35/+2
* Integrated internal changes from GoogleAdam Cozzette2018-03-1315-73/+387
* Merge branch 'master' into down-integrateAdam Cozzette2017-12-013-37/+586
|\
| * Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Anuraag Agrawal2017-11-293-37/+586
* | Integrated internal changes from GoogleAdam Cozzette2017-12-016-35/+123
|/
* Merge from google internalJisi Liu2017-10-185-16/+70
* Integrated internal changes from GoogleAdam Cozzette2017-09-147-36/+1091
* Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1818-477/+737
|\
| * Merge from Google internal for 3.4 releaseJisi Liu2017-07-1818-477/+737
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
|/
* Down-integrate from google3.Feng Xiao2017-03-2929-191/+528
* Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\
| * Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
* | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
* | Fix lint warnings in the javalite branch.Jisi Liu2017-03-094-0/+9
|/
* Merge pull request #2602 from GreatFruitOmsk/issue-2428Feng Xiao2017-03-081-1/+4
|\
| * Update AbstractMessage.javagoorov2017-01-131-1/+1
| * Update AbstractMessage.javagoorov2017-01-121-1/+4
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-316-31/+57
|/
* Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-011-3/+4
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-172-6/+46
|\
| * #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1713-70/+222
|/
* Fix java compatibilty tests.Feng Xiao2016-10-101-350/+1
* Integrate internal changesBo Yang2016-10-1015-1045/+3628
* Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
* Versioning Java GeneratedMessage.Feng Xiao2016-07-191-0/+2716
* Include javadoc/source in Java release packages.Feng Xiao2016-07-185-16/+16
* Remove Java deterministic API.Feng Xiao2016-07-181-1/+1
* Fix compatiblity issues.Feng Xiao2016-07-141-4/+4
* Integrate from internal code base.Feng Xiao2016-07-132-0/+46
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-032-20/+20
* Integrated internal changes from GoogleAdam Cozzette2016-06-2927-1336/+2728
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | Down integrate from Google internal.Jisi Liu2016-04-2837-1248/+4088
|/
* Integrate google internal changes.Jisi Liu2016-03-3025-1171/+3651
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-032-2/+2
* Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
* Integrate from google internal.Jisi Liu2016-01-2965-0/+29230
* Undo the Java module change for integration.Jisi Liu2016-01-2866-29307/+0
* throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-153-4/+80
* Restructuring protobuf to multiple modulesnmittler2016-01-1366-0/+29231
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 19:40:47 +0000