aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2016-11-04 11:37:40 -0700
committerGitHub <noreply@github.com>2016-11-04 11:37:40 -0700
commitca800ea823a380fb3f0ddb490962b9021cd0c1eb (patch)
tree71e50c1688a29d95f0307c4c9d7e1e2767ef30be
parent7bd11fcb59872b4448b13a1bdfc173428fdfb8f6 (diff)
parent089aaa996a378276f7c4e37a230836bf786cddf6 (diff)
downloadprotobuf-ca800ea823a380fb3f0ddb490962b9021cd0c1eb.tar.gz
protobuf-ca800ea823a380fb3f0ddb490962b9021cd0c1eb.tar.bz2
protobuf-ca800ea823a380fb3f0ddb490962b9021cd0c1eb.zip
Merge pull request #2330 from manupsunny/master
Fix message for InvalidProtocolBufferException
-rw-r--r--csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs2
-rw-r--r--javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs b/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
index eeb0f13a..0fbc5306 100644
--- a/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
+++ b/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
@@ -61,7 +61,7 @@ namespace Google.Protobuf
{
return new InvalidProtocolBufferException(
"While parsing a protocol message, the input ended unexpectedly " +
- "in the middle of a field. This could mean either than the " +
+ "in the middle of a field. This could mean either that the " +
"input has been truncated or that an embedded message " +
"misreported its own length.");
}
diff --git a/javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java b/javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
index 3864d38a..9a83d6d3 100644
--- a/javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
+++ b/javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
@@ -48,7 +48,7 @@ public class InvalidProtocolBufferNanoException extends IOException {
static InvalidProtocolBufferNanoException truncatedMessage() {
return new InvalidProtocolBufferNanoException(
"While parsing a protocol message, the input ended unexpectedly " +
- "in the middle of a field. This could mean either than the " +
+ "in the middle of a field. This could mean either that the " +
"input has been truncated or that an embedded message " +
"misreported its own length.");
}