aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2014-08-29 11:39:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 11:39:06 +0000
commita609653bd386bd478b06a99c9777737e01c118fa (patch)
treeae1a17c95da31d395dc7f3b45700a7086f626bbb
parent274705a9165eb058023dfc63e66095cd1ad6e476 (diff)
parent04f70ef5c7b73b4ebc768b5dcb75ed2ac8ddee1e (diff)
downloadprotobuf-a609653bd386bd478b06a99c9777737e01c118fa.tar.gz
protobuf-a609653bd386bd478b06a99c9777737e01c118fa.tar.bz2
protobuf-a609653bd386bd478b06a99c9777737e01c118fa.zip
am 238e0ac5: Merge "Fixed octal printing of bytearrays"
* commit '238e0ac56654afadb5270264660db7305f139c02': 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 572a7075..ec12c7da 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));
+ builder.append(String.format("\\%03o", ch && 0xff));
}
}
builder.append('"');