diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-04-04 09:31:14 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-04 09:31:14 -0700 |
| commit | 37c7b766b39b5d86e6bb920d1664d91dcf8399e7 (patch) | |
| tree | 5d669c6e7adc41dd40cddd81076e248c418faca2 | |
| parent | cc3fa2ec80d196e045ae05797799f079188106f3 (diff) | |
| parent | 58373fa160368d825255b0103235b1b769520f14 (diff) | |
Merge pull request #2930 from anuraaga/dev_rag
Fix error message for int64 parse failure.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | java/util/src/main/java/com/google/protobuf/util/JsonFormat.java | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -84,6 +84,8 @@ src/**/*.trs java/core/target java/util/target javanano/target +java/.idea +java/**/*.iml # Windows native output. cmake/build diff --git a/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java b/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java index 838700f7..7d6718b8 100644 --- a/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java +++ b/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java @@ -1536,7 +1536,7 @@ public class JsonFormat { BigDecimal value = new BigDecimal(json.getAsString()); return value.longValueExact(); } catch (Exception e) { - throw new InvalidProtocolBufferException("Not an int32 value: " + json); + throw new InvalidProtocolBufferException("Not an int64 value: " + json); } } |