aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2014-08-29 15:30:30 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-29 15:30:31 +0000
commit0068978c364173b15a9cb8ab65fb2d2eac17f136 (patch)
treea0a60e243d94cdf170426c4cfacb593f67a5ee84 /java
parent77866143340f7541180d91fa316071ce947b3a8d (diff)
parentf56bd09ac980fcde8b6af4e3fbd5bf9c97fc9199 (diff)
downloadexternal_protobuf-0068978c364173b15a9cb8ab65fb2d2eac17f136.zip
external_protobuf-0068978c364173b15a9cb8ab65fb2d2eac17f136.tar.gz
external_protobuf-0068978c364173b15a9cb8ab65fb2d2eac17f136.tar.bz2
Merge "Fixed octal printing of bytearrays"
Diffstat (limited to 'java')
-rw-r--r--java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
index 572a707..4cca3d5 100644
--- a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
+++ b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
@@ -243,7 +243,7 @@ public final class MessageNanoPrinter {
builder.append('"');
for (int i = 0; i < bytes.length; ++i) {
- int ch = bytes[i];
+ int ch = bytes[i] & 0xff;
if (ch == '\\' || ch == '"') {
builder.append('\\').append((char) ch);
} else if (ch >= 32 && ch < 127) {