third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/TimeUtilTest.java ('k') | third_party/protobuf/javanano/pom.xml » ('j') | third_party/protobuf/patches/0008-uninline_getemptystring_and_getemptystringalreadyinited.patch » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

diff --git a/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto b/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

index 686edc422183d34d3a67130d112fa76d9bf6588e..bd22f65a74e84221dd5954575b0d0232797cf2b3 100644

--- a/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

+++ b/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

@@ -124,6 +124,7 @@ message TestOneof {

oneof oneof_field {

int32 oneof_int32 = 1;

TestAllTypes.NestedMessage oneof_nested_message = 2;

+ google.protobuf.NullValue oneof_null_value = 3;

}

@@ -194,6 +195,7 @@ message TestStruct {

message TestAny {

google.protobuf.Any any_value = 1;

+ map<string, google.protobuf.Any> any_map = 2;

}

message TestCustomJsonName {