Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1149)

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

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: 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
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 3d73efb3a0b22ebbe9291b7eb96f14880ee0b06e..7b791d9e6c40d2abcfe4a49e89ae45d9b625585c 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,6 +364,7 @@ class MessageReflection {
* Finishes the merge and returns the underlying object.
*/
Object finish();
+
}
static class BuilderAdapter implements MergeTarget {
@@ -548,6 +549,7 @@ class MessageReflection {
public Object finish() {
return builder.buildPartial();
}
+
}
@@ -711,6 +713,7 @@ class MessageReflection {
throw new UnsupportedOperationException(
"finish() called on FieldSet object");
}
+
}
/**

Powered by Google App Engine
This is Rietveld 408576698