aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2014-08-28 18:19:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-28 18:19:36 +0000
commit77866143340f7541180d91fa316071ce947b3a8d (patch)
tree298bf379e2d05489ab6d5907221d22778bb1e885
parent238e0ac56654afadb5270264660db7305f139c02 (diff)
parentc9c2ffc3c005fbcaac2d0f91094bdb1928cb309e (diff)
downloadexternal_protobuf-77866143340f7541180d91fa316071ce947b3a8d.zip
external_protobuf-77866143340f7541180d91fa316071ce947b3a8d.tar.gz
external_protobuf-77866143340f7541180d91fa316071ce947b3a8d.tar.bz2
Merge "Revert "Fixed octal printing of bytearrays""
-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 ec12c7d..572a707 100644
--- a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
+++ b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
@@ -249,7 +249,7 @@ public final class MessageNanoPrinter {
} else if (ch >= 32 && ch < 127) {
builder.append((char) ch);
} else {
- builder.append(String.format("\\%03o", ch && 0xff));
+ builder.append(String.format("\\%03o", ch));
}
}
builder.append('"');