aboutsummaryrefslogtreecommitdiff
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
commit2b69e07cf3b6785043d08b57ede4a254a4bd8692 (patch)
treedbb8abe3f82dcd8e5419983ff33160ce85dfa03f
parent04f70ef5c7b73b4ebc768b5dcb75ed2ac8ddee1e (diff)
parent42da25e969fbd80d7ae5b553dc73708d98d9ae2b (diff)
downloadprotobuf-2b69e07cf3b6785043d08b57ede4a254a4bd8692.tar.gz
protobuf-2b69e07cf3b6785043d08b57ede4a254a4bd8692.tar.bz2
protobuf-2b69e07cf3b6785043d08b57ede4a254a4bd8692.zip
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 ec12c7da..572a7075 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('"');