From 62fafe7edae5540022c917ac0fa04ad761acab51 Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Fri, 16 Apr 2021 12:43:55 +0200 Subject: [PATCH] core: clarify exception message Reformulate message to highlight that SizeEnforcingInputStream is applied on the message size of the message after decompression. --- core/src/main/java/io/grpc/internal/MessageDeframer.java | 4 ++-- .../src/test/java/io/grpc/internal/MessageDeframerTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/MessageDeframer.java b/core/src/main/java/io/grpc/internal/MessageDeframer.java index 9a523746e5..534398315e 100644 --- a/core/src/main/java/io/grpc/internal/MessageDeframer.java +++ b/core/src/main/java/io/grpc/internal/MessageDeframer.java @@ -517,8 +517,8 @@ public class MessageDeframer implements Closeable, Deframer { private void verifySize() { if (count > maxMessageSize) { throw Status.RESOURCE_EXHAUSTED.withDescription(String.format( - "Compressed gRPC message exceeds maximum size %d: %d bytes read", - maxMessageSize, count)).asRuntimeException(); + "Decompressed gRPC message exceeds maximum size %d", + maxMessageSize)).asRuntimeException(); } } } diff --git a/core/src/test/java/io/grpc/internal/MessageDeframerTest.java b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java index c1907e5170..5edf64ef85 100644 --- a/core/src/test/java/io/grpc/internal/MessageDeframerTest.java +++ b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java @@ -378,7 +378,7 @@ public class MessageDeframerTest { try { thrown.expect(StatusRuntimeException.class); - thrown.expectMessage("RESOURCE_EXHAUSTED: Compressed gRPC message exceeds"); + thrown.expectMessage("RESOURCE_EXHAUSTED: Decompressed gRPC message exceeds"); while (stream.read() != -1) { } @@ -424,7 +424,7 @@ public class MessageDeframerTest { try { thrown.expect(StatusRuntimeException.class); - thrown.expectMessage("RESOURCE_EXHAUSTED: Compressed gRPC message exceeds"); + thrown.expectMessage("RESOURCE_EXHAUSTED: Decompressed gRPC message exceeds"); stream.read(buf, 0, buf.length); } finally { @@ -467,7 +467,7 @@ public class MessageDeframerTest { try { thrown.expect(StatusRuntimeException.class); - thrown.expectMessage("RESOURCE_EXHAUSTED: Compressed gRPC message exceeds"); + thrown.expectMessage("RESOURCE_EXHAUSTED: Decompressed gRPC message exceeds"); stream.skip(4); } finally {