third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java - 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/core/src/main/java/com/google/protobuf/MessageReflection.java

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

Patch Set: Make chrome settings proto generated file a component Created 4 years 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/core/src/main/java/com/google/protobuf/MessageLiteToString.java ('k') | third_party/protobuf/java/core/src/main/java/com/google/protobuf/NioByteString.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java

diff --git a/third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java

index 7b791d9e6c40d2abcfe4a49e89ae45d9b625585c..3d73efb3a0b22ebbe9291b7eb96f14880ee0b06e 100644

--- a/third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java

+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java

@@ -364,7 +364,6 @@ class MessageReflection {

* Finishes the merge and returns the underlying object.

Object finish();

}

static class BuilderAdapter implements MergeTarget {

@@ -549,7 +548,6 @@ class MessageReflection {

public Object finish() {

return builder.buildPartial();

}

@@ -713,7 +711,6 @@ class MessageReflection {

throw new UnsupportedOperationException(

"finish() called on FieldSet object");

}

/**