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

Unified Diff: third_party/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.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
Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java
diff --git a/third_party/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java
index 3f3e9bd15eaa08994cb13122efdafa3d3638aed8..6fa555df150964f16eafca81e63533a8ed590035 100644
--- a/third_party/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java
@@ -406,6 +406,7 @@ final class RopeByteString extends ByteString {
right.writeTo(output);
}
+
@Override
protected String toStringInternal(Charset charset) {
return new String(toByteArray(), charset);

Powered by Google App Engine
This is Rietveld 408576698