From 11c902ea2ef0a481f607693b35b6cc765e9f4caa Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Mon, 3 Apr 2017 17:32:08 +0900 Subject: Add IntelliJ project to gitignore for java project. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9e10c141..431ca29c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,6 +84,8 @@ src/**/*.trs java/core/target java/util/target javanano/target +java/.idea +java/**/*.iml # Windows native output. cmake/build -- cgit v1.2.3 From 58373fa160368d825255b0103235b1b769520f14 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Mon, 3 Apr 2017 17:35:42 +0900 Subject: Fix error message for int64 parse error. --- java/util/src/main/java/com/google/protobuf/util/JsonFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } } -- cgit v1.2.3