diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2015-04-02 14:22:35 -0700 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-04-02 15:06:32 -0700 |
| commit | badef1fc19566745e1a052430202bb34b6a6150f (patch) | |
| tree | fff4fda42b9d686e575ace97fb5de18822c97512 /java/src/main/java/com/google/protobuf/ByteString.java | |
| parent | 2820e86aab2417a8274dc64a6d5de62f1fcaedc8 (diff) | |
| download | protobuf-badef1fc19566745e1a052430202bb34b6a6150f.tar.gz protobuf-badef1fc19566745e1a052430202bb34b6a6150f.tar.bz2 protobuf-badef1fc19566745e1a052430202bb34b6a6150f.zip | |
Move `UTF_8` to `Internal`
Diffstat (limited to 'java/src/main/java/com/google/protobuf/ByteString.java')
| -rw-r--r-- | java/src/main/java/com/google/protobuf/ByteString.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/src/main/java/com/google/protobuf/ByteString.java b/java/src/main/java/com/google/protobuf/ByteString.java index 04ac7c9a..1d5d4e8a 100644 --- a/java/src/main/java/com/google/protobuf/ByteString.java +++ b/java/src/main/java/com/google/protobuf/ByteString.java @@ -78,8 +78,6 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { static final int MIN_READ_FROM_CHUNK_SIZE = 0x100; // 256b static final int MAX_READ_FROM_CHUNK_SIZE = 0x2000; // 8k - protected static final Charset UTF_8 = Charset.forName("UTF-8"); - /** * Empty {@code ByteString}. */ @@ -282,7 +280,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { * @return new {@code ByteString} */ public static ByteString copyFromUtf8(String text) { - return new LiteralByteString(text.getBytes(UTF_8)); + return new LiteralByteString(text.getBytes(Internal.UTF_8)); } // ================================================================= @@ -661,7 +659,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { * @return new string using UTF-8 encoding */ public String toStringUtf8() { - return toString(UTF_8); + return toString(Internal.UTF_8); } /** |