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
commitbe60c85171898d025270678443b321399840cb86 (patch)
treedbb8abe3f82dcd8e5419983ff33160ce85dfa03f
parenta609653bd386bd478b06a99c9777737e01c118fa (diff)
parent2b69e07cf3b6785043d08b57ede4a254a4bd8692 (diff)
downloadprotobuf-be60c85171898d025270678443b321399840cb86.tar.gz
protobuf-be60c85171898d025270678443b321399840cb86.tar.bz2
protobuf-be60c85171898d025270678443b321399840cb86.zip
am 77866143: Merge "Revert "Fixed octal printing of bytearrays""
* commit '77866143340f7541180d91fa316071ce947b3a8d': 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('"');