@@ -359,11 +359,11 @@ index 000000000..320977290
359359+ }
360360+ }
361361diff --git a/src/main/java/com/google/protobuf/ByteString.java b/src/main/java/com/google/protobuf/ByteString.java
362- index 8ba729c8e..62aae86ee 100644
362+ index 7b2455f12..f906a4774 100644
363363--- a/src/main/java/com/google/protobuf/ByteString.java
364364+++ b/src/main/java/com/google/protobuf/ByteString.java
365- @@ -422 ,6 +422 ,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
366- }
365+ @@ -430 ,6 +430 ,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
366+ return new NioByteString(buffer);
367367 }
368368
369369+ /**
@@ -376,8 +376,17 @@ index 8ba729c8e..62aae86ee 100644
376376 /**
377377 * Wraps the given bytes into a {@code ByteString}. Intended for internal usage within the library
378378 * to force a classload of ByteString before LiteralByteString.
379+ @@ -961,8 +968,6 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
380+ * @return true for equality of substrings, else false.
381+ */
382+ abstract boolean equalsRange(ByteString other, int offset, int length);
383+ -
384+ - private LeafByteString() {}
385+ }
386+
387+ /**
379388diff --git a/src/main/java/com/google/protobuf/CodedInputStream.java b/src/main/java/com/google/protobuf/CodedInputStream.java
380- index 224ced529..64c3efa37 100644
389+ index 81da41778..80fd9153c 100644
381390--- a/src/main/java/com/google/protobuf/CodedInputStream.java
382391+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
383392@@ -178,6 +178,15 @@ public abstract class CodedInputStream {
@@ -396,7 +405,7 @@ index 224ced529..64c3efa37 100644
396405 /** Disable construction/inheritance outside of this class. */
397406 private CodedInputStream() {}
398407
399- @@ -3957 ,4 +3966 ,652 @@ public abstract class CodedInputStream {
408+ @@ -3970 ,4 +3979 ,652 @@ public abstract class CodedInputStream {
400409 }
401410 }
402411 }
@@ -1265,3 +1274,4 @@ index d52006754..92ed1f1f7 100644
12651274 /**
12661275 * Encodes an input character sequence ({@code in}) to UTF-8 in the target array ({@code out}).
12671276 * For a string, this method is similar to
1277+
0 commit comments