diff options
author | Anuraag Agrawal <rag@istellar.jp> | 2018-05-11 14:27:31 +0900 |
---|---|---|
committer | Anuraag Agrawal <rag@istellar.jp> | 2018-05-11 14:27:31 +0900 |
commit | 92ac1ed6a5baf58651e70759021910baa614332a (patch) | |
tree | 8e5dbd21fc10ab69d3b0a15241a5bc14e53a8e61 /java/core/src/main/java/com/google/protobuf/Utf8.java | |
parent | 7377d81ca44baf2e505c927a2e25b2f0e3596fed (diff) |
Remove unsafe no-copy String allocation since it's not useful in recent Java versions.
Diffstat (limited to 'java/core/src/main/java/com/google/protobuf/Utf8.java')
-rw-r--r-- | java/core/src/main/java/com/google/protobuf/Utf8.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/Utf8.java b/java/core/src/main/java/com/google/protobuf/Utf8.java index 6968abb3..de75fe6b 100644 --- a/java/core/src/main/java/com/google/protobuf/Utf8.java +++ b/java/core/src/main/java/com/google/protobuf/Utf8.java @@ -1474,10 +1474,7 @@ final class Utf8 { } } - if (resultPos < resultArr.length) { - resultArr = Arrays.copyOf(resultArr, resultPos); - } - return UnsafeUtil.moveToString(resultArr); + return new String(resultArr, 0, resultPos); } @Override @@ -1553,10 +1550,7 @@ final class Utf8 { } } - if (resultPos < resultArr.length) { - resultArr = Arrays.copyOf(resultArr, resultPos); - } - return UnsafeUtil.moveToString(resultArr); + return new String(resultArr, 0, resultPos); } @Override |