third_party/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldLite.java - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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/MapFieldLite.java

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile error Created 4 years, 7 months 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

« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/java/core/src/main/java/com/google/protobuf/MapField.java ('k') | third_party/protobuf/java/core/src/main/java/com/google/protobuf/Message.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/MapFieldLite.java

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

similarity index 99%

rename from third_party/protobuf/java/src/main/java/com/google/protobuf/MapFieldLite.java

rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldLite.java

index 16d3e6d224e74a82c64e64fb8570c04385307b42..960b633909a064b526deeb9c16948c92eed10212 100644

--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/MapFieldLite.java

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

@@ -136,7 +136,7 @@ public final class MapFieldLite<K, V> implements MutabilityOracle {

private static int calculateHashCodeForObject(Object a) {

if (a instanceof byte[]) {

- return LiteralByteString.hashCode((byte[]) a);

+ return Internal.hashCode((byte[]) a);

}

// Enums should be stored as integers internally.

if (a instanceof EnumLite) {